summaryrefslogtreecommitdiff
path: root/tools/aapt2/optimize/MultiApkGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-06-18 23:08:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-18 23:08:48 +0000
commitd648b70ecaa510ea193df487dfb101039ab162ca (patch)
tree90d724e7784994ae01771f9f83600f581f03364c /tools/aapt2/optimize/MultiApkGenerator.cpp
parentbaeccac9f53ca7ce8ed6bfbda08ea2ef8546313e (diff)
parentf15a2dd3947c323bf06a90b0a6564bea970ea32d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9ea1842c38 -s ours am: 5e26e1d81c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/optimize/MultiApkGenerator.cpp')
0 files changed, 0 insertions, 0 deletions