diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 12:04:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 12:04:06 +0000 |
| commit | 1411e29a3e0cb88088ddc58504d0e3eea9d0206b (patch) | |
| tree | dd29eb4f911ba980cb68368ca01e04afc5ffb8e3 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | a5f045da44195cb0a2adb01299e4714052e6a96a (diff) | |
| parent | b2e6bdfcdb69fbd6920f5c551eb71ce613be7bdc (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361 am: b2e6bdfcdb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: I0668ed146259bc8c4dca5b2e0a8e24dd2e9d404a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions