Benedict Wong d5e3147ca1 Merge "Add stubs for VCN configuration management" am: 03492715e8 am: 43dbf5cb2c am: a0740b9727 am: 292f2b8dbf ...

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

Change-Id: Id2d4d4fdc716cb6a9e72ec5ad072d72063fdad59

2020-11-17 06:10:47 +00:00

..

api

Merge "resolve merge conflicts of 07bfeb3630 to master"

2020-11-17 05:51:13 +00:00

java

Merge "Add stubs for VCN configuration management" am: 03492715e8 am: 43dbf5cb2c am: a0740b9727 am: 292f2b8dbf

2020-11-17 06:10:47 +00:00

jni

Merge changes from topic "revert-12787270-FYIHXORGZY"

2020-11-14 03:22:09 +00:00

proto

Merge changes from topic "voice_metrics_android_s"

2020-11-16 20:21:54 +00:00

res

Merge changes from topic "biometricservice-cts"

2020-11-16 18:50:24 +00:00

sysprop

Update API of sysprop_library to match current.txt

2020-10-15 10:38:48 +00:00

tests

Merge "Add non-app power consumers to the PowerStatsViewer"

2020-11-17 02:21:48 +00:00

xsd

Remove vts10 related configs

2020-10-05 11:04:45 -07:00

TEST_MAPPING

…