summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2015-02-10 22:21:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-10 22:21:09 +0000
commita6fab6e114a80364714c463db3ac4b204730f08b (patch)
tree37bb6aa1b7a15d3c45a06914e44f088cc4f2941b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent524c46001f3f55552194b774c2e89c8c0ff0507c (diff)
parentdc77ec59beb23a2ff300d5048633687c0d68a0ac (diff)
am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
automerge: dc77ec5 -s ours * commit 'dc77ec59beb23a2ff300d5048633687c0d68a0ac': Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions