summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-10-06 06:52:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-10-06 06:52:28 +0000
commitdcad223fb3ca064e26ada9f68fb22bbed1cf64ce (patch)
treea7d17b680d4ba5dc3bbcce1fa8686c841359f962 /tools/aapt2/java/JavaClassGenerator.cpp
parent039759c1c9b5b08aa7ff3dcd07af4b0a3324bb23 (diff)
parent11d487498ec1fb6064fe5351f6d285d5500f7782 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours am: efec4764b4 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions