diff options
| author | 2021-11-16 07:46:23 +0000 | |
|---|---|---|
| committer | 2021-11-16 07:46:23 +0000 | |
| commit | 5f4b6c370e70a06668e1e1c00240c1d77e8f8a4f (patch) | |
| tree | 258fe97251345ad3424e22e2ffce340d3843465c /tools/aapt2/ResourceParser.cpp | |
| parent | 8b19e90188d20ba8369ea6c85b0af1a98e7efb2a (diff) | |
| parent | c212d73420ced2a55a60e9935fc986aa4ce4ff73 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 22b77795b1 -s ours am: faaf3e29ac -s ours am: 644f937c57 -s ours am: c212d73420 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16236633
Change-Id: I86e0d21dd3b2168739b9356e8cd47ad76aa105df
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions