summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-25 16:04:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-25 16:04:55 +0000
commitcb22ec811fbb41aec57203e6befc5401cad14d74 (patch)
treedf730b6beccc8d7367c8319f0f185217f959d665 /tools/aapt2/java/JavaClassGenerator.cpp
parent70b911af046f1280547251f02827056c31a3d19d (diff)
parentc5dba2b31257db60021de99f242e5e64f83476b3 (diff)
Merge "Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev am: f1f25ad5f2 am: b23ad33d58" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions