Joshua Mccloskey 315f6f124d Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19039844

Change-Id: I0e5645ff7a507ebd9c8c29f347ed6e45f3f365d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-07-26 20:56:14 +00:00

..

api

Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea am: b0bbe9b5f3 am: fd818a3610 am: 27f8e8943b

2022-07-20 11:39:04 +00:00

java

Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe

2022-07-26 20:56:14 +00:00

jni

Merge "Rename jniGetReferent to GetReferent and cache the method id it uses." am: fe892a0f52 am: f0ac357afb am: d0058603e0 am: e309903df1

2022-07-21 23:49:26 +00:00

proto

Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev am: db8dacec8a

2022-07-26 16:37:11 +00:00

res

Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe

2022-07-26 20:56:14 +00:00

sysprop

…

tests

Merge "Inline Time.TIMEZONE_UTC." am: a092e31b3e am: ce361177f5 am: 5d4265af9b am: f39d439341

2022-07-26 18:37:40 +00:00

xsd

…

TEST_MAPPING

…