| commit | 5d2470ced4c547722d1ea624025d907433131d71 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed May 10 02:55:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 10 02:55:23 2017 +0000 |
| tree | 6a1a158c53f42516a0e8920ef8cae67df08d5d1b | |
| parent | 713a5901e4d00e7319676dbe82194992a8214c5f [diff] | |
| parent | 95197882b4ad3619bdc3bcfdd80a7ca5f7e57ad8 [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 582a84640e -s ours" into oc-dev-plus-aosp am: 95197882b4 -s ours Change-Id: Icfeaf573e6e6d5d35b2786d38df77c07fb9be9ea