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