Lorenzo Colitti 98802d08bf Merge changes I28e39400,Ibada8b42 am: c5f2057d02 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59bcae23f71d57715845b1f613c0733a04725763

2021-01-14 11:00:43 +00:00

..

api

Merge changes I28e39400,Ibada8b42

2021-01-14 10:39:48 +00:00

java

Merge changes I28e39400,Ibada8b42

2021-01-14 10:39:48 +00:00

jni

Merge "Reland revert of "Added mitigation for b/122921367""""

2021-01-12 20:32:17 +00:00

proto

Addition of OWNERS / initial .proto file

2021-01-07 15:52:12 +00:00

res

Merge "Additional SysUI leads in OWNERS for resources in frameworks/base/core." am: 8d01f4d407

2021-01-14 09:19:48 +00:00

sysprop

Update API of sysprop_library to match current.txt

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

tests

Merge "AbsSeekBarTest: Fix dpToPixel computation"

2021-01-13 18:28:45 +00:00

xsd

Remove vts10 related configs

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

TEST_MAPPING

…