summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2017-09-15 23:23:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-15 23:23:48 +0000
commitc910573484d8a90bbce7e073d200e53bb50bb317 (patch)
tree89eaa677fa89023be84acf5a48cbf6328eae5319 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf83e81117ae239e6b22fea3bec05f2c1eb2bf45c (diff)
parent4f65a3571345f38c199dcd50ab5369e070877c96 (diff)
Merge "Color extraction should not block switchUser" into oc-mr1-dev
am: 4f65a35713 Change-Id: Ic77d657bef1e7336e1774395da26886e4840a03c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions