summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-07-14 12:56:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-07-14 12:56:24 +0000
commit6716b8bb943de5b48d264f8eef5ada81e81a5e39 (patch)
tree79669d5d81f34cc106be5517b5346a8e990378e6 /tools/aapt2/ResourceTable.cpp
parent500978b4935f23588ef4c96347156c6b768c4174 (diff)
parentc3963c3c50331b02996e4be21a965ddec8174334 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0c36db22b4 -s ours am: 8bd4f0bb4f -s ours am: c3963c3c50 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15279864 Change-Id: Ia636b43aafe8559fbf152b441246bfea83568f9f
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions