summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-19 01:20:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-19 01:20:16 +0000
commit6af22c7ec3d49dbdd896d2b0cc1b426c978ba19f (patch)
tree5708d82f29d6aee63a08c9601d3569f4b83e4f81 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf02c6436239453c2c564888a6039317e965a8694 (diff)
parent60d7eeddb646e190d07fa5bc23450cbf160f396e (diff)
Merge "Merge \\\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d am: f78637ff64 -s ours am: 19d013d4e3 am: 091cdab02d" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions