Adam Bookatz 32768fd60d Merge "BatteryStats custom buckets: don't revive dead Uids" into sc-dev am: 0b905b1ef4 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a8954b852f26216bab3bdb21ab44d4e3168c5d4

2021-02-25 14:34:16 +00:00

..

api

Merge "Introduce 'dataExtractionRules' manifest attribute" into sc-dev am: f7bc904f44

2021-02-25 14:32:37 +00:00

java

Merge "BatteryStats custom buckets: don't revive dead Uids" into sc-dev am: 0b905b1ef4

2021-02-25 14:34:16 +00:00

jni

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

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

proto

Add compat info to WindowManager proto dump

2021-02-23 08:09:05 +00:00

res

Merge "Introduce 'dataExtractionRules' manifest attribute" into sc-dev am: f7bc904f44

2021-02-25 14:32:37 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

tests

Merge "JNI wrapper for FpsListener." into sc-dev am: 1a621e8eff

2021-02-25 14:30:32 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

TEST_MAPPING

…