summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-07-19 19:24:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-19 19:24:47 +0000
commit76783bbe3471c0c880cbc824fe8b7b903b4ba8da (patch)
tree658c3672e8eccc8398ca181b5ac80ef3e3bea21a /tools/aapt2/java/JavaClassGenerator.cpp
parentb936f13c73b22365685cc160fd8410624edecee2 (diff)
parentd2d3a20624d968199353ccf6ddbae6f3ac39c9af (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: d2d3a20624 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188942 Change-Id: I5d843553ee40c23594e18040a3da0ddd56591ff1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions