summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2017-07-25 16:17:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-25 16:17:14 +0000
commit80aa9c4b1c79b062ca6acbbd01c474b27ac5bf31 (patch)
tree1074d3214f34e8cdfb0fe22b2e0444b4ad34d479 /tools/aapt2/java/JavaClassGenerator.cpp
parent429a9b76da149147f10a2ec22ec584c887771801 (diff)
parentcb22ec811fbb41aec57203e6befc5401cad14d74 (diff)
Merge "Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev am: f1f25ad5f2 am: b23ad33d58" into oc-mr1-dev-plus-aosp
am: cb22ec811f Change-Id: Ia0388c3c3b45ec9fd16fe4006484f4ca21f2bc8b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions