commit | 48b33e70c1d0549c12869772eda00523291fae87 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 23 13:06:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 13:06:32 2017 +0000 |
tree | 0dbcb393f0a90fd3c5886553759aac7c177db571 | |
parent | 6b141823704201525679e10e31f3fd0c0bb3c42a [diff] | |
parent | 9b312998e4f02ba65cf9d10486ddb885671d9676 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9b312998e4 -s ours Change-Id: I9e903fa0986f1ae2edb84e01ec1e7ff5985f47ca