Neil Fuller 8a0ce64177 Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 ...

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

Change-Id: I2a65d7c9a91f5b3f5772ba8b2b199bfe3096077b

2020-09-30 09:35:03 +00:00

..

res

Merge mainline-release 6664920 to master - DO NOT MERGE

2020-09-17 21:56:59 -07:00

src/com/android/shell

Merge "Update language to comply with Android's inclusive language guidance"

2020-09-28 14:11:49 +00:00

tests

Merge "Update language to comply with Android's inclusive language guidance"

2020-09-28 14:11:49 +00:00

Android.bp

Convert packages/Shell/**/Android.mk file to Android.bp

2019-05-02 21:35:45 -07:00

AndroidManifest.xml

Add a new permission in AOSP

2020-09-30 08:39:25 +00:00

OWNERS

…