summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-06 16:12:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-12-06 16:12:04 +0000
commitda7ac9e54cbd3a590be04cdef63cb142aab84de9 (patch)
tree689cf430f83c28b9ba9c88db7868bc72c1dcecfd /tools/aapt2/java/JavaClassGenerator.cpp
parentc110ac2338dd4ea61747f311a3c88cbcb2acb6d3 (diff)
parent38b62a1d36ac98187ca847b6771b083ade272419 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions