tree 2bfde6b45eb46dcd60940ce6ded007964e31e13f
parent 9ad1671d3bc86aa5da17380846499d7419eb6afc
parent 1777e8fcc3f6e92a87f8b74be4da6f867bbedff9
author Bill Yi <byi@google.com> 1491121892 +0000
committer android-build-merger <android-build-merger@google.com> 1491121892 +0000

Import translations. DO NOT MERGE am: 035fa0123d  -s ours
am: 1777e8fcc3  -s ours

Change-Id: I12d994ef78ef8ada317ad7f123b29fd29b408cfc