Bill Yi 4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE ...

Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43

2021-04-13 19:36:45 -07:00

..

res

…

src/com/android/companiondevicemanager

RESTRICT AUTOMERGE

2021-02-09 01:23:48 +00:00

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-16 04:09:57 -08:00

AndroidManifest.xml

RESTRICT AUTOMERGE

2021-02-09 01:23:55 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

…