diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-04 10:46:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 10:46:04 +0000 |
| commit | 72ac8b44a274b3d539ded09789eb144e34d8f182 (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 955f115336a8eeb30a35e5ee7e3fbe9db04f6075 (diff) | |
| parent | 3df1e7787aa382b48899b0a6165d9fb3b529ba03 (diff) | |
[automerger skipped] Merge "Require permission to create trusted displays" into rvc-qpr-dev am: c2b395c713 am: 3df1e7787a -s ours
am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 6e61790d80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400348
Change-Id: Icdaa9f2566c725ef4eefc7e6a430c73d97829ca1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions