diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-06-27 00:36:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 00:36:56 +0000 |
| commit | 597ddfcbc5da770b29ed4d7f725eb802c8c48ccb (patch) | |
| tree | 0a51a05b8a53734147245d4b193f8b6acc627d0c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 11e9ed87f772e595365470378e06fe5d551b1b99 (diff) | |
| parent | bd1d8bf4c2a5beaf2a6b6e97cfa9591f004eafa4 (diff) | |
Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: 36520c229f" into oc-dr1-dev-plus-aosp
am: bd1d8bf4c2
Change-Id: I770e8c209a9885685c1415cbb4a3c6a2ccb37e44
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions