| commit | c54bcf0a3e8fd1830aa0d17dcccb6db46441525d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Aug 16 19:50:08 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 19:50:08 2017 +0000 |
| tree | 1a4e570f95188a6147ea8b6571d7ff6bab060dec | |
| parent | f342a1f0842303e19fafbc18c56acacb2ff7e6b8 [diff] | |
| parent | 2eb13c7a733753836b7ae342b85e57c5b13ad3a6 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6ccc89cb13 -s ours am: 2eb13c7a73 -s ours Change-Id: I9e1128e18a5f99fafeee1382f9b0a6f6c3a1ae96