summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDaniel Nishi <dhnishi@google.com>2016-06-23 16:34:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-23 16:34:41 +0000
commit812c7d98fc5e6ca6aa73644bdb388e4ac657ad45 (patch)
tree18590c200a2ccb4ee8be212f6dff88b5c4da0c65 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent71ea683b6253b151e38cae058a4bed4e8da8ee44 (diff)
parent2c0f1a8773a203396391ff259f0e4fa5ce320eb4 (diff)
Merge \\"On phones, don\\'t show the avatar icon when it is the only user.\\" into nyc-mr1-dev am: 9ee8f8066c
am: 2c0f1a8773 Change-Id: I8689b1ae160323fb3b309c7e9b32913856fab7ef
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions