Jakub Pawlowski 62a89184b0 Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada am: a42efdda60 am: 25d2513d12 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b52c5dfd77e41d13c9326026c06bf292470433

2021-02-08 22:12:24 +00:00

..

api

Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada am: a42efdda60 am: 25d2513d12

2021-02-08 22:12:24 +00:00

java

Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada am: a42efdda60 am: 25d2513d12

2021-02-08 22:12:24 +00:00

jni

Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c am: e399fb29d4

2021-02-08 21:39:56 +00:00

proto

Merge "Log energy consumer result attribution data" into sc-dev

2021-02-04 23:07:39 +00:00

res

Merge "Revert "Update the bouncer to be able to move to either side of a wide screen."" into sc-dev am: 5d3ce05739

2021-02-08 20:53:22 +00:00

sysprop

…

tests

Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 am: 0192f22a73

2021-02-08 21:38:20 +00:00

xsd

…

TEST_MAPPING

…