summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSungsoo Lim <sungsoo@google.com>2016-07-19 01:52:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-19 01:52:19 +0000
commitd7b6fdcbfe2f40dbcbe18e38f77484ae0b06171d (patch)
tree42c7d803835a0f6c41c26b844ae4e6cf4a05beeb /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf692d5b182a8d28fb9c1479bad1af8853e3bb0fe (diff)
parente889c1daf68bc70526821b777a18b291e9dc33d9 (diff)
Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04 -s ours am: d1b350ce7d am: d8f381af5a am: e863a0c868 am: 16b9011dd5 -s ours am: f5cddc7ef6 am: b4f2154ee2\" into nyc-mr1-dev-plus-aosp
am: e889c1daf6 -s ours Change-Id: Ifd37b6e57f28c33b4d34f305f792c815d5a5ac03
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions