tree f40511da3bbcbcb57dd68c4a5a669f3a6e86b527
parent d9d86a483bdc9c6a9971de62d4b570a4858cc3e9
parent 81ffbe540eae79439707d2951f038359e5876d53
author Bill Yi <byi@google.com> 1508521400 +0000
committer android-build-merger <android-build-merger@google.com> 1508521400 +0000

Import translations. DO NOT MERGE am: 9223c18a08  -s ours am: 5c965d7a0e  -s ours
am: 81ffbe540e  -s ours

Change-Id: Ibb6587e01a339ec59ad3303829ea2c70f05ba75e