| commit | 9caeec066dc409c90a0c4e652b371508863aeef7 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Jul 22 17:18:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 22 17:18:52 2017 +0000 |
| tree | c687fb1ed10c2d9bca3206b7385d2fec5fc70fdc | |
| parent | 0412212ef1817c17fecfc4ec16d52f0ea99b6df7 [diff] | |
| parent | 85de7f20ab6ef5a1d20124b985e4d0faf7dee0c7 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae -s ours am: 85de7f20ab -s ours Change-Id: Idf7c4ff6a3fe6bb8ebc2c1a4bb8fac55b10c6d72