summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2016-07-14 22:37:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-14 22:37:53 +0000
commitd6acdcee264f6ca1a5133ab7f1b6e4ec572a312c (patch)
treeda503d87b3d0ca8b9373fa75727809bc7b52c88d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdc8ad8d49d6e8a40084b60419c7aa2d8846fb486 (diff)
parentc0ab2e83ac76af3aebe6d9a14595d0c10cfeec04 (diff)
Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev
am: c0ab2e83ac Change-Id: Iaa4d63c425f5d263d322d463c320312890588aaf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions