tree ab1d6c7757276e3886a8284b391f29b2a4c17f3e
parent 0c9a4e9d5e0c3698b783caef194ffc9d409c07a2
parent a006965edd44b27540a7a38322242250cf24601a
author Bill Yi <byi@google.com> 1479695418 +0000
committer android-build-merger <android-build-merger@google.com> 1479695418 +0000

Import translations. DO NOT MERGE am: dabd82f737  -s ours
am: a006965edd  -s ours

Change-Id: I5269092532de8ac743174e9197f08491b2e3dbd6