diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 11:49:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 11:49:52 +0000 |
| commit | efdca76dc2c996ee9c7f1e5dd707b2114781bb15 (patch) | |
| tree | 4478169cf3f3b4b270ac6422a3334e069c51aeeb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 15d348e4c505db40b601fdf439ac556eedda8a11 (diff) | |
| parent | 13a80d911de505860380c1a09eecabd08c43f94a (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b539388631 -s ours am: 13a80d911d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375235
Change-Id: I8a90755125cf23c8cb9c2b92284f7f008049214a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions