Josh Gao c78b8d8dac Merge "Add proto tombstones to Dropbox." am: 3361ca6c56 am: 093e8d266a am: a1b7331722 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I490ba33c58b47c29f0c828bd0f1bcbe7f1eb24c0

2021-02-18 10:49:24 +00:00

..

api

Merge "Adding a permission to protect exact alarms" into sc-dev

2021-02-18 07:13:39 +00:00

java

Merge "Add proto tombstones to Dropbox." am: 3361ca6c56 am: 093e8d266a am: a1b7331722

2021-02-18 10:49:24 +00:00

jni

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

proto

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

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

res

Merge "Adding a permission to protect exact alarms" into sc-dev

2021-02-18 07:13:39 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

tests

Merge changes I474cd019,I8d87c1da,I90ebad48 into sc-dev

2021-02-18 00:24:48 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

TEST_MAPPING

…