| commit | 4b780af321542ec05c4316798a72480e5a5da8cc | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 16 20:51:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Sep 16 20:51:01 2017 +0000 |
| tree | 8dac9a42d7e98e4a1a7093c7f7bf0d6a214fb9d6 | |
| parent | 4a102609a265024c075c3e3b80c3259cfdeb5d8b [diff] | |
| parent | 2a8bb45240296294f52b72864f235aeb66259686 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: adbd504f40 -s ours am: 2a8bb45240 -s ours Change-Id: I9938a0ebaa742d84ba067dd9034551510c74b4e0