diff options
author | 2021-04-23 18:06:57 +0000 | |
---|---|---|
committer | 2021-04-23 18:06:57 +0000 | |
commit | 991dc6ed6821f9f0631208d33b9b526c984599e4 (patch) | |
tree | 1e4c60235391377c089f7717610fd908ddf2ff46 /tools/aapt2/ResourceParser.cpp | |
parent | 42edcfbdb62e7f48bc9acb9c84f33dfa8d2a837a (diff) | |
parent | d4810a91b2a628dc1383cc81d452731b70140e08 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4bd777bc28 -s ours am: d4810a91b2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14294970
Change-Id: I7cc508d86382993675f30c7b7abaa9ef041581bd
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions