summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSalvador Martinez <dehboxturtle@google.com>2017-07-25 00:10:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-25 00:10:27 +0000
commite94731c47bf7c39fb780cceca087c4c592dd9db8 (patch)
tree53283f1d5c4b88f948bad25bdc27c08a214018b5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7dcdd4aed1a128b66e7d90c151d4f4ad60d1aa67 (diff)
parentf68823e51e4477bbdac35ca98f3a6d5fd9052f6c (diff)
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev am: f104b68a04
am: f68823e51e Change-Id: I291ec343b9c774449203c1c519e9685fbc19c552
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions