| commit | ebe3456233a59b18fb7262ddabcb2ec90b7fccde | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed May 24 11:43:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 24 11:43:41 2017 +0000 |
| tree | 5d8001b4836022923a60092dacbd6a553169231f | |
| parent | b4022fa37f70c23a53fa065b3d09256271392ab5 [diff] | |
| parent | f2b6f1043971e370dac438ebbeaea86f8d6f6253 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: d72d69f45b -s ours am: f2b6f10439 -s ours Change-Id: I53eeb77474ce8d9c822cc6df953aa9f262a0cbdc