summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceUtils.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-02-20 17:45:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-20 17:45:02 +0000
commitde19d80f378fb1930e396ef8b5b27764b6a8b2d3 (patch)
tree1f3488297e037cdc79e354cbe83da635f1a5105d /tools/aapt2/ResourceUtils.cpp
parentf906a38eed0634cb17b5c2e7e6395b2c7d84151e (diff)
parentb2e1b0262fc04ada82227eba415fcca79defe039 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 31dccf9f69 -s ours am: 67619a4e57 -s ours am skip reason: subject contains skip directive"
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions