summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorxinhe <xinhe@google.com>2015-01-28 21:45:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-28 21:45:25 +0000
commit93487e286e6bfa434fb092c6276d96b40e5d62c4 (patch)
tree26d9484bd939f633221dffc2c636346dbb8180b9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4a40f7cc90d8f908527d2cfff32376ee51259250 (diff)
parentfc921d19b6d6d26f3b0147ba9c1ee96298e6a17c (diff)
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
automerge: fc921d1 * commit 'fc921d19b6d6d26f3b0147ba9c1ee96298e6a17c': Sprint: MMS cannot be sent in the UK
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions