summaryrefslogtreecommitdiff
path: root/tools/aapt2/Resource.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-09-27 18:57:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-27 18:57:42 +0000
commitd720d8bbe099a21105b899a197916277a36a62ad (patch)
treec0129da72f725eff81de20ca3a4af985f621dc7d /tools/aapt2/Resource.cpp
parent1e9c24d5aaf1d4d1149ba1589b2eb1aa57869d17 (diff)
parentf6f9b6a488800c160c82118b597c84192ecedade (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 609b34c630 -s ours am: 6ae994ecb1 -s ours am: f6f9b6a488 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20037750 Change-Id: I0e1b23c6de28238b10a1d06979277ba799904bc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/Resource.cpp')
0 files changed, 0 insertions, 0 deletions