| commit | 260be05dc7059b749d13b4ca21781286564b964b | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Jun 17 06:09:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jun 17 06:09:13 2017 +0000 |
| tree | 2c77e7660e559be269c424156e763f7cf5c46e13 | |
| parent | 68b08e7b8311d712b2605c33630ac002591edef9 [diff] | |
| parent | 92c2ff2307334c3e3407176d479052063615fea5 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fa8fa0d212 -s ours am: 92c2ff2307 -s ours Change-Id: I80efbfae39a572306becec0f7839a49c1e3d9775