diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 12:16:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 12:16:20 +0000 |
| commit | ec9f3efc54fe2994c067eb94fa6f1dfe90054c54 (patch) | |
| tree | 82b8c921b8d78d4be58e276e0438531e01b163c3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7a7c9e8dca9a48025a2565f4857bb14a6adaffd7 (diff) | |
| parent | 447bb685c1fdeea77457603390ee9a0f8673e1cb (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-dev am: 278c4994b6 am: 447bb685c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11326773
Change-Id: I2d4378502241e412b00c5c75026629d3fc99cc72
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions