summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-03 12:04:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 12:04:17 +0000
commite945d13e264e11903b9ea8dbb9fc8b61b5449cb1 (patch)
treeca87616132bb68139db008719927b482d1c6b933 /tools/aapt2/java/JavaClassGenerator.cpp
parent3d3389fbac10e75cc52da9a4ec3c84af39f48cd3 (diff)
parentefdca76dc2c996ee9c7f1e5dd707b2114781bb15 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b539388631 -s ours am: 13a80d911d -s ours am: efdca76dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375235 Change-Id: I4a73acad6efa6fb77d07fb9d81f2199fec8e8b7d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions