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:19:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-08 22:19:50 +0000
commitc8abdab5be344a21e4426827bae5b6562bf180bf (patch)
tree08be6fdfd7cd4e4fcbf0093b43db77d7e46b5591 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent698e90b1f0fe4b105127d029c0db1aa42fd09ea9 (diff)
parent07b3195f7b156d9123797fac9160bc27cb17263c (diff)
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 '07b3195f7b156d9123797fac9160bc27cb17263c': 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