diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-08 13:25:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-08 13:25:39 +0000 |
| commit | db7bdef41a682998e62432c2cc992fa0bd16ff12 (patch) | |
| tree | 5b8c7bf179624752bf95a3943d3c443c166432f3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6611cca1ae13a1f4b435d6375b02dc45f605bd1c (diff) | |
| parent | 639e6eb5cfd041e652ba9284076efd56bf64118c (diff) | |
Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be59043 am: e88250ddfa am: 639e6eb5cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530318
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11214c97d046087e37129585f71d147e41a7b70e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions