tree 7580a2761354a163b3bebb48a8c9be1c87ab622f
parent a6a6f7f8726f29d5971a4ceaeeb956d385b76381
parent fa86245b814c591021e192354eb5bf089b778527
author Bill Yi <byi@google.com> 1493984326 +0000
committer android-build-merger <android-build-merger@google.com> 1493984326 +0000

Import translations. DO NOT MERGE am: 11b0c356f5  -s ours
am: fa86245b81  -s ours

Change-Id: I61669634ccdb70c2ca14028f25ed222aab5a92b5