summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-27 23:57:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-27 23:57:15 +0000
commite7ee805c6a2af979702a195901d0db4c642945ed (patch)
treed9c58f9e5b72ed6a93480fcd2f0ef5d6c5aff251 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9b17ebca8f59117eca0c1e59e754b5b3a1dac844 (diff)
parent89d4427097aaa42ef413b1929d28698955adaf7e (diff)
Merge changes Ibed11e8a,Ic6bf0c4b into nyc-mr1-dev
* changes: Merge \"docs: Added Android N (API level 24) to the \"API levels\" table\" into nyc-dev am: ffe63a4ad8 docs: Added Android N (API level 24) to the \"API levels\" table am: 563c4f1adb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions