diff options
| author | 2018-06-01 12:59:37 -0700 | |
|---|---|---|
| committer | 2018-06-01 12:59:37 -0700 | |
| commit | 4495ee4f2b76c1b528f9eab636f8ecc9ab51b5fd (patch) | |
| tree | 47ba4855298395018d302d11c2941e75e34d0638 /tools/aapt2/ResourceParser.cpp | |
| parent | 9e1ca30b6b6ea534196ebb1d1c9fe1ad74633a6f (diff) | |
| parent | 66e3c8428c7440698f81e808cc9563aaab4eb3b2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ce67e5d1d5 -s ours
am: 66e3c8428c -s ours
Change-Id: I0f00ed9d07d325cf76e4c0abda30d99dedab2e1d
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions