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