diff options
| author | Marin Shalamanov <shalamanov@google.com> | 2020-09-21 14:24:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-21 14:24:28 +0000 |
| commit | 0cd45f9615bd5393aee38a144985ade34092d321 (patch) | |
| tree | f8da4936735b992a959c87ec4b22198d51cab6d0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb5216d7fc84a49b7c87648a48b5d1c411007a80 (diff) | |
| parent | 1a6fa2ea729c78b8bffde7e7ee6f9c523f4003dc (diff) | |
[automerger skipped] Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 am: 544040036e am: 1a6fa2ea72 -s ours
am skip reason: Change-Id I257636ae2a6ed74044e71e49a99024682c3a92c5 with SHA-1 97ba024fb0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968
Change-Id: Ica809882180c5aebb739390ab2b4708bb36063b5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions