summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-09-22 22:03:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-22 22:03:13 +0000
commitc8ceb557fd5bcdfe74743dac7bbc1b131d4b2359 (patch)
treee1e9a83caf8cb28b7475834d16017ffd62b37dd2 /tools/aapt2/java/JavaClassGenerator.cpp
parent2c686e8655f17f1d6e11ff633b73f6c05ca19f8a (diff)
parent2865b04701d4905e9336d710990601fa398fff0d (diff)
Merge "Immediately deliver new intent to paused activities. am: 03f7e9e944 am: 08d6689303" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions