diff options
| author | Bill Yi <byi@google.com> | 2019-06-18 16:49:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-18 16:49:23 -0700 |
| commit | 9aeeb3e5e921a318cb27e15b9375b5ff68b1d893 (patch) | |
| tree | c04ad7f21e1a7efd57ba53e2640cf08601286552 /tools/aapt2/optimize/MultiApkGenerator.cpp | |
| parent | e6cb275b8599c73bbbfd67503600a77b09621f3e (diff) | |
| parent | d648b70ecaa510ea193df487dfb101039ab162ca (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9ea1842c38 -s ours am: 5e26e1d81c -s ours
am: d648b70eca -s ours
am skip reason: subject contains skip directive
Change-Id: I5b8cb08f8ccc7592e4e5811868a216b39ee53074
Diffstat (limited to 'tools/aapt2/optimize/MultiApkGenerator.cpp')
0 files changed, 0 insertions, 0 deletions