summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 22:13:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 22:13:28 +0000
commit07b3195f7b156d9123797fac9160bc27cb17263c (patch)
tree509353c840203253da9a61aca842b9091d0d8c2b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent27a85cca7c001ec47749feb60461081f14b2dfe3 (diff)
parentc698ece7cf5d2651741439921f7a241a4f51354b (diff)
am c698ece7: am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev
* commit 'c698ece7cf5d2651741439921f7a241a4f51354b': docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions