commit | cf8be6d4e0c8678cf9fb26fe4228c47858f5e437 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Nov 01 08:01:13 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 01 08:01:13 2016 +0000 |
tree | d8de22341230a46354abdd39eb9f547c0a2e054a | |
parent | 5b5862c1a8e8578512248e1f12bfc1f86af20537 [diff] | |
parent | c0ff60f272b5da3759079a8be1ae95b195645494 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e82b728101 -s ours am: c0ff60f272 -s ours Change-Id: Idb46ad6bc668e3e86b964c0a9e74581116b56812