summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-10-22 05:37:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-22 05:37:19 +0000
commitd83ef0e074f70534182be3a6089d494a7af4837c (patch)
tree095383077465ba95c424f89f945fb97e8b390b20 /tools/aapt2/ResourceParser.cpp
parentce9ddf533783aee7f5ddcf76e5ce2216d43fbf99 (diff)
parent82443994f89735edff0256fd7b91f8f1ed133459 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 82443994f8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16105902 Change-Id: I08e411430498578728202a1fb6b10fc10879ff74
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions