summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-04-23 17:45:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-23 17:45:05 +0000
commit4c41fca732300aab758a478d07cfef87a3ac4623 (patch)
tree15fc051edfa339bc67c6afa07e296ee469d426e5 /tools/aapt2/ResourceParser.cpp
parenta6f847e8862e375c2c0184d1254dd74333aea3d6 (diff)
parent3e6e11d131d3b267887d46f8540cee4ef673931e (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3e6e11d131 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14294719 Change-Id: I76a67231eafb094a58c3d1236330a0e70c26f381
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions