TreeHugger Robot 8a43d3dcdd Merge "Remove iwlan mac config" into sc-dev am: e7f53e4de5 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic669006efd1430db0ceba3f7e476743cf33d13d3

2021-02-20 21:13:51 +00:00

..

api

Merge "Remove iwlan mac config" into sc-dev am: e7f53e4de5

2021-02-20 21:13:51 +00:00

java

Merge "Add discharge power estimates to BatteryUsageStats" into sc-dev am: 9fb89c22ca

2021-02-20 21:13:34 +00:00

jni

Specify version for aidl_interface explicitly

2021-02-19 10:50:01 +09:00

proto

Merge "Clean up after VibratorManager feature introduced" into sc-dev

2021-02-15 16:14:26 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-02-20 16:59:08 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-17 13:26:09 -08:00

tests

Merge "Add discharge power estimates to BatteryUsageStats" into sc-dev am: 9fb89c22ca

2021-02-20 21:13:34 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-17 13:26:09 -08:00

TEST_MAPPING

…