diff options
| author | Salvador Martinez <dehboxturtle@google.com> | 2017-07-25 00:05:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-25 00:05:50 +0000 |
| commit | ac791f4454f62503962612f85ce3ea56306db3f1 (patch) | |
| tree | 267861ae2bae5402a2c756b6e8e27e30532731ac /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 02fbb07f221320df7cffbe33e4e29dae8630cf37 (diff) | |
| parent | f104b68a04f09e24afd5d7865c96e18c821bf6f5 (diff) | |
Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev
am: f104b68a04
Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions