summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-14 01:26:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-14 01:26:31 +0000
commit744888ed1bf52bfc85868d26252baac6b08fb77f (patch)
tree371f92229cc58f053ca68ba2e4b0a584b06b2bfb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent62457a7889c499ec7747e4c461790a41b2b8e51b (diff)
parentabd6f9576e4dfe5a4c0b42c26a2937119974bfe9 (diff)
Merge "Merge \\\\"Correct parentActivity example in Activity Element docs.\\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716 am: 3f1741a19c am: 0ea3ffd6c1" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions