| commit | 5343c4111ef073d9875464ab6d68a1788787189d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Apr 11 19:48:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 11 19:48:06 2017 +0000 |
| tree | 8d5558aed04f0d560f03f2fef1912bf21f011a8b | |
| parent | 91c79c280a93a6da1b205f6b2491c49dff4f8c0e [diff] | |
| parent | 270c407f95bbd31e075b8e47238b8c0b7a0eb39f [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 0a472ed0df -s ours am: 270c407f95 -s ours Change-Id: Iac45a0f24e35f76253e51acc1182f15243adeb2a