summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2015-02-10 22:26:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-10 22:26:33 +0000
commit094ff96b3f5a7fefb7e7dd75cb21927cfed42a81 (patch)
tree5a73792354f4b2639f86e92d9f1f5d0fa3b17c6e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4b79268cb7f4fdf7a024c9802d4f176db267eba7 (diff)
parenta6fab6e114a80364714c463db3ac4b204730f08b (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
automerge: a6fab6e -s ours * commit 'a6fab6e114a80364714c463db3ac4b204730f08b': 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