| commit | 6f33a52d3224b346e4c3a1651024787d2bba02bb | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu May 11 11:50:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 11 11:50:09 2017 +0000 |
| tree | 30b38046308a4b1b7640a0c2580182461a795911 | |
| parent | 9eecfb3de7c1af297e747f1f312cad3745cb482a [diff] | |
| parent | ee8789939e46b2018308a52ff025889d9891a434 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: f1730bee90 -s ours am: ee8789939e -s ours Change-Id: I4078ac746b6c2382d26ef9a1aa750c09bd414ede