| commit | 786e3feb89781afc7bfc37a740a2ad21415e8109 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 21 08:08:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 08:08:38 2017 +0000 |
| tree | 1425b276cc496710dd40f0e7c4db5c0caaa1d281 | |
| parent | 6883b04f5f1cde27dc66d7ef12e1beac6db39b81 [diff] | |
| parent | 5a081a225f81af6389a81a8b01205970a505ac92 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 4b76d33968 -s ours am: 5a081a225f -s ours Change-Id: Ic1bf6ba0bc6571119489cf4f9b4035dfcf9279c7