summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-06-26 23:37:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-26 23:38:03 +0000
commitbd1d8bf4c2a5beaf2a6b6e97cfa9591f004eafa4 (patch)
treea54f559059accde6f87f11998b8b702e5328c45f /tools/aapt2/java/JavaClassGenerator.cpp
parent9b723d886e1e0efc9e5266b61ce35eae2f442ed0 (diff)
parent13b9a0e72645e807a5b3b22b4711279abf3c52d7 (diff)
Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4c0b am: 36520c229f" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions