commit | 12d5d305552d41e32d463adfe6be45441ab19d4f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Feb 20 18:32:18 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 20 18:32:18 2018 +0000 |
tree | 19de45c83c982a9b355127a8c18bdc41aaa82331 | |
parent | 28ff9ceeeb2aa9f864a0f73e6d3557125042c22a [diff] | |
parent | eeaa000ce3b61e97dbb4b092b9ea419b9eba6ec9 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 646773f4ef -s ours am: eeaa000ce3 -s ours Change-Id: Ibb2ed0a33e9e1c46a780c606b0aed991fae90f5f