Dmitri Plotnikov 6da67ebebe Merge "Add UID time-in-state to UidBatteryConsumer" into sc-dev am: 02073550c0 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I055a28959af4454a5620c6d040501a8a221818be

2021-02-26 05:25:43 +00:00

..

api

Merge "Revert "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from API"" into sc-dev am: 52e885a65b

2021-02-26 04:16:40 +00:00

java

Merge "Add UID time-in-state to UidBatteryConsumer" into sc-dev am: 02073550c0

2021-02-26 05:25:43 +00:00

jni

Merge "JNI wrapper for FpsListener." into sc-dev

2021-02-24 22:41:10 +00:00

proto

Merge "Log the temp allowlist reason/duration at FGS start." into sc-dev

2021-02-26 01:21:13 +00:00

res

Merge "Tweak strings for traffic light face enrollment" into sc-dev am: 48ac7eba33

2021-02-26 02:06:34 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

tests

Merge "Add UID time-in-state to UidBatteryConsumer" into sc-dev am: 02073550c0

2021-02-26 05:25:43 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

TEST_MAPPING

…