summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-08-04 02:16:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-04 02:16:19 +0000
commit48af0c3a1dc7590a619770ccab3abfd32e4fb8c5 (patch)
tree2e28bc751e20089af3820feb9d08bbc4fdf9190c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent57e58ede6d700b28bc995b0f87b1c730e30d0475 (diff)
parent25b9724575275e330a1426328a500eebc4c05866 (diff)
Merge "Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: 6c955db797 am: 82c686b714" into nyc-mr1-dev-plus-aosp am: 598f7cea13"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions