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:31:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 22:31:22 +0000
commit5b21623a147ff2a6d21e676b4603347f820a8c3a (patch)
tree23f1ac354c44ce649fc61a8e23dbe78c99268660 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent468c67810be04b5ba9ca65f2b511b9dc9739be7e (diff)
parentc8abdab5be344a21e4426827bae5b6562bf180bf (diff)
am c8abdab5: am 07b3195f: 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 'c8abdab5be344a21e4426827bae5b6562bf180bf': 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