| commit | 65db3f4cfbd432704bf048411974c26aeaf21e97 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon May 21 11:57:10 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 21 11:57:10 2018 -0700 |
| tree | 75a29bca352f933cdfa1fc12415f823b4a025ad8 | |
| parent | f9216a4d2358b7806f5d56ca6a26c71e54e167b7 [diff] | |
| parent | 33ad5a99dde7418f45335c7e6c66f29de1cacf1a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35426e5e69 -s ours am: 33ad5a99dd -s ours Change-Id: Ifc05f3503a635804c9008e28ccc5cf807f69905b