commit | 2a8069da03d43d1e933d4b7db5924b4a4e4c09ce | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 22 13:49:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 22 13:49:27 2017 +0000 |
tree | 1fa6669d44ca78cff009d06ba9ed36dc51e7be07 | |
parent | 58df3f4b2e6a8b8a1d2944ab4461e5a6b208dccf [diff] | |
parent | 131ccb00a8f62076769d38bc6d335eafa7fd7bc4 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1 -s ours am: 131ccb00a8 -s ours Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691