diff options
| author | Bill Yi <byi@google.com> | 2019-05-20 08:25:03 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 08:25:03 -0700 |
| commit | 9c6483c1eb24e90c86fdc200b1f0bfd97cde2669 (patch) | |
| tree | f4a1cbc811af2af65721e65b8f7417fddfe615ab /tools/aapt2/ResourceParser.cpp | |
| parent | 3d914b56c4c287da6fae72c67d4ec7cbdb2a9776 (diff) | |
| parent | 32ca05803549119321502794342761d6124854bf (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3b7a08e360 -s ours am: 843ab671ab -s ours
am: 32ca058035 -s ours
am skip reason: subject contains skip directive
Change-Id: I6a7bc76788bca5a568e3cb6a42dd9555d4d145ea
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions