commit | 9bb4e94d0a93e354b98c6df6b044461719d7ecaf | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 21 17:49:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 17:49:13 2017 +0000 |
tree | 221205da7f02c5d78c80f9a614e6ee33d053c14a | |
parent | 3ae1830916963ce5fda8855579601ea70a296c38 [diff] | |
parent | d77d71b7a5b5af1697284321627e5006eb1e1d4f [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e43661faae -s ours am: d77d71b7a5 -s ours Change-Id: I1c1d7f81006788cd8629c6c6c6ba7be60a6d1513