commit | fdb54c41a9295286afaea240623312cd40e5b709 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 30 22:07:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 30 22:07:43 2017 +0000 |
tree | e365cf7d943119ff452bdf308fa77a6828ef85d6 | |
parent | ab056c8fbd6941df8095baa2e34342e7664f3e83 [diff] | |
parent | 28faa6be017d11492cb03c65148d9508754217c0 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 84a3a06d39 -s ours am: 28faa6be01 -s ours Change-Id: Ia0f50f8336627453fe117e1643fe4c1f8dbf59e8