| commit | dbf188f78ca5469bc250707d76ebe8460cca5ea7 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Dec 21 19:17:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 19:17:15 2017 +0000 |
| tree | 15a8d2b1b711c91d5497e7771b2ca157298c2e32 | |
| parent | 016a5bf4db161e176a8474fa4e4d9fa0148d2624 [diff] | |
| parent | b5ea28b58aa2d86f0df5859e70e39f08ce90e05e [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 0149f480f6 -s ours am: b5ea28b58a -s ours Change-Id: Idd470a77aa63ed039e169da8a187ccaa5f456148