Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
am: ca86110548
am: 29a1747a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942 Change-Id: I7497ca614617ee14d2e8008cef20682fadc55bd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: