tree 2f6394ca50d9f80be392f3e95e1ff3894d2650fc
parent 42203f5f7d665e03a2b2bfedeaa93b417bfc0a4b
parent ca913a61074e659b60a9a04a3263b677c48cd310
author Bill Yi <byi@google.com> 1505336890 +0000
committer android-build-merger <android-build-merger@google.com> 1505336890 +0000

Import translations. DO NOT MERGE
am: ca913a6107  -s ours

Change-Id: Idc97f7644ef2f4de1e916a72e3b1c97b3dc62a86