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:04:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 22:04:36 +0000
commitc698ece7cf5d2651741439921f7a241a4f51354b (patch)
tree9596a76331e70e2bc59d5e7bbef3013d2f659a71 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfb53f11515554f618d5888c8137119bcc4f316cb (diff)
parent3bed3bf498eadcaa760608a415c66e017d2eb690 (diff)
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 '3bed3bf498eadcaa760608a415c66e017d2eb690': 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