commit | 4ec78fa17b5888adf33d9a06a1b1793292241cf2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 08 23:15:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 23:15:04 2017 +0000 |
tree | ab32e1895b5a5d7ebcf1d3dfdb625d36acd177fe | |
parent | 95657195cae612250b351d8e5dc7fa6ea0a8a5d6 [diff] | |
parent | dd5886bc5b44060b7cf1b7be7f8f2c4d7b8b5ef3 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: dd5886bc5b -s ours Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f