summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-11-16 07:16:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-16 07:16:58 +0000
commit644f937c5788052d9c8a7f77519aa2fb5b3f903f (patch)
treed58f8b2b8c72bf5dd8a956e665ee85e9ce983fd6 /tools/aapt2/ResourceParser.cpp
parentf36b39c3f0845608bce0b1bf1268c776bb715772 (diff)
parentfaaf3e29acb04a59da5ed800f8896e6e1f8d6f5b (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 22b77795b1 -s ours am: faaf3e29ac -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16236633 Change-Id: I51c567284f0ae77020c161d7e89f0f07f3d65c50
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions