| commit | ad5073c7f2797e9b569580072c8ca69750752ca4 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu May 11 09:53:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 11 09:53:50 2017 +0000 |
| tree | 3e0ea1429943ccb45c712cddd482a3ce0c3d87bd | |
| parent | 923551292a4ec5f80c8b1d1c3fce2148ea0c0033 [diff] | |
| parent | aa1bf314eb3a010f3a4942f8f213e6ccdd7fe184 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 899ca73297 -s ours am: aa1bf314eb -s ours Change-Id: I01dc92be277adaa7fe0fa170719e1f35384c37ab