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-15 15:03:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-15 15:03:17 +0000
commit66ce89f9b978b9f79b62612c1a791f042ac04b63 (patch)
tree2adacc42deed07052a2d96b02d104ad05a7bd56e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent846547fae4e0586fbbedbefce1d161c6308bcb0f (diff)
parent2ba2a9e3bcf8a4508af74acaf13b7d83f92437cc (diff)
Merge "Merge \\"Update semantics of on-body Keystore API.\\" into nyc-dev am: c152fc15a9 am: 6aaa25d722" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions