summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2016-09-26 17:35:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-26 17:35:31 +0000
commit52b1a7b7b80cf280a63053edf411eff504f921c4 (patch)
tree3d7e4849abcca70dd6631f86d63fe65ad09469da /tools/aapt2/java/JavaClassGenerator_test.cpp
parent94f938a56f14810917846297631bc39aa7539f9e (diff)
parent7a7a82c20db11f470df7d7385333fd7efd01107b (diff)
Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev am: 6f1b29ef67 am: ad5ef71eff
am: 7a7a82c20d -s ours Change-Id: Id67434e623de198b5f3917a4c246bd9b1a4e635e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions