Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 am: c5a94b2043
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586 Change-Id: I9beb78a4c730bd02ddcac1c6bb749a7e9a453a48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: