tree 8324dcf24d0f1777749a053996159eaf8b5b8c1d
parent 15ae243519704020c04947cdeca8f5e69e08002f
parent cd9fc9343dd2caa5e4e6ed58f19d0288a4e101c3
author Bill Yi <byi@google.com> 1501938061 +0000
committer android-build-merger <android-build-merger@google.com> 1501938061 +0000

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

Change-Id: I234813862faf6650a165721d2fdcba77eeda385f