diff options
| author | 2021-11-16 07:17:30 +0000 | |
|---|---|---|
| committer | 2021-11-16 07:17:30 +0000 | |
| commit | 52ce494d8a8488b1effb44cdf43099f4afe60d9a (patch) | |
| tree | d58f8b2b8c72bf5dd8a956e665ee85e9ce983fd6 /tools/aapt2/ResourceParser.cpp | |
| parent | 3f3bbfc4285d94602bd13b576d8505e766a95987 (diff) | |
| parent | 7184ee463b4009953137cd8a9a016668f07ddfff (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fa8f158180 -s ours am: 7184ee463b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16230908
Change-Id: I74af16c4e6d0b6a22bb1f16d68ebe663bf929eb6
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions