diff options
author | Jason Monk <jmonk@google.com> | 2016-06-22 16:03:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 16:03:14 +0000 |
commit | 4b11a552ff32c1be76b0accf3ab86fc688646054 (patch) | |
tree | 1560a00fa842cee5adc8f641685e9cc08f997279 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d7c3cfd5d6dff83c4d580690d9025fd1550aba0c (diff) | |
parent | 4342d0bf822850bed36d5a20f42f4f3125c1ab9f (diff) |
Merge \\\"QS: Fix default icon handling for services\\\" into nyc-dev am: 94a20367b5 am: 726aee885a
am: 4342d0bf82
Change-Id: If5c3e91470de4002726888ecc836aff6bca366b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions