commit | d90d7c5193a964dc5e19098a827b5d764cce4ce6 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Oct 31 03:54:53 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 03:54:53 2017 +0000 |
tree | 2b5d739764941d2f23fc165de97eb344ae9f7926 | |
parent | 9fb54263155dd3d469d6f19992c6adf21de82ac9 [diff] | |
parent | d3528de4c9bc40f3d21cfbed0ff8b641a11e6332 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 89688902b8 -s ours am: d3528de4c9 -s ours Change-Id: I05bcb32b3c013d15a76939a3a974f88d36d94aeb