diff options
| author | Bill Yi <byi@google.com> | 2017-09-06 19:55:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-06 19:55:47 +0000 |
| commit | e2ad4634f2116b5ae236584b4c44b0c3e6815d29 (patch) | |
| tree | 96232b58158b9c2236e0db293b9c9ac063c9d2c1 /tools/aapt2/Main.cpp | |
| parent | d3810d8e893b6c558e80deaa6b61a87ff61a9c30 (diff) | |
| parent | 4c652d23b94a9b674b9cc6feacffe006cd38cd69 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14b975a42d -s ours" into oc-mr1-dev-plus-aosp
am: 4c652d23b9 -s ours
Change-Id: I4756b57ed74a077851323d377762fc55a7fdd02b
Diffstat (limited to 'tools/aapt2/Main.cpp')
0 files changed, 0 insertions, 0 deletions