commit | 4831f6e435dc1714d098ad632ab63dd263afd792 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Sep 21 19:00:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 21 19:00:28 2017 +0000 |
tree | 5add4ef0d08f01d947cd930bf1a012cf09bbc651 | |
parent | 5b2769848d281a976d82fdefb9e72fe7ba974dac [diff] | |
parent | 2a8734c90b35dc8fabf78661ebebf89e87132e40 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 20f3c4508c -s ours am: 2a8734c90b -s ours Change-Id: If40b4dc7ae398f9b0d8ae7705ab2abc294b0c55a