tree 1b1fe87e35769ba5a99510d0bfe863f8e3a539dc
parent 7f37fc887c56772ee892d106d202dee6a20432a9
parent ae3c57da0de45ee83547af7f278369cd31bb9b77
author Bill Yi <byi@google.com> 1504060288 +0000
committer android-build-merger <android-build-merger@google.com> 1504060288 +0000

Import translations. DO NOT MERGE am: d8cf9ad720  -s ours
am: ae3c57da0d  -s ours

Change-Id: I35edc2725202cb92ed50f42b9a50ae3bdbd997e3