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