summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-06-09 11:27:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-09 11:27:27 +0000
commit7dcba84cbe10423a97b4a305acaa747b494bc1a1 (patch)
tree57c17e36aeb3ac2f419146d3970ef5c970c6af88 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent014d0ebc8f5f8c170f02a35785de7734475ac82c (diff)
parent07b4c8fec068ef68ec26df8022d6f3fda8419571 (diff)
Merge "Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde am: d1e55c133d" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions