summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorRob Carr <racarr@google.com>2017-07-20 19:17:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-20 19:17:43 +0000
commit581d13afcd4de40735dc406a2edd45c3e6cf4b83 (patch)
tree092078ee680b9e073973fdd8efc59d9f9ff040cb /tools/aapt2/java/JavaClassGenerator.cpp
parent9a2c79f7a9087dd64685368f4bdd0d0494716020 (diff)
parent52e3c6fa1502c56c60a76ca40da8cc1666b1e13b (diff)
Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am: afe3eb81da am: 00089101fd" into oc-mr1-dev-plus-aosp
am: 52e3c6fa15 Change-Id: I94bdd6e3c3a41f69070b9f83d277312d5aa249d5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions