tree 36e27a9a20a7fc29e5399f8c352c694587a61301
parent 9ca888eb54113bd1e0a61991e08d06ec9e63e751
parent 7c22e05bb487e44aca0bb428f1ef039b9592133d
author Bill Yi <byi@google.com> 1502919452 +0000
committer android-build-merger <android-build-merger@google.com> 1502919452 +0000

Import translations. DO NOT MERGE am: f13d963366  -s ours
am: 7c22e05bb4  -s ours

Change-Id: I698fda570af4504225a078e21e2109d4a2cd64b1