summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-08-26 14:20:41 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-26 14:20:41 -0700
commit1d597a007f368c3e273efdd4289eb3388e928b17 (patch)
tree2b2ed916de07674a56ff7ee09b750d6c68188fe7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0e429304d9a468e4078d101a9c935dc96ec989df (diff)
parent9173f1228df62303331c80209c8c7f137c14a385 (diff)
[automerger skipped] Merge "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master" into stage-aosp-master am: 4f4af6ba7c -s ours am: bdb03efbfc am: 02edcfe3fd
am: 9173f1228d -s ours am skip reason: subject contains skip directive Change-Id: Ia75b412514c7eb011bc25b2738e43347d3c01552
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions