commit | db28fe1e7df9dd0a3c9c324e43978362df801fa6 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Nov 30 22:05:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 30 22:05:14 2017 +0000 |
tree | 05053477d4038f2eaa5d2a9ee55d3a38eb6177c6 | |
parent | 5c8732f388ba0ea6a450663941cfd0a6116232a0 [diff] | |
parent | ae57527637d08aa641e66a86201efc57cb2dbf31 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ea754a6814 -s ours am: ae57527637 -s ours Change-Id: Ic657c3d4895f2743002ca9874ca43bfecdaeb9ab