tree 19e3618e5aa6439d4408c85912b5ed5f18bae127
parent c2b9f772d07fa6e89bf7cd91593fa3a5943eeb4b
parent 87c4d55ccb6156a07224404c94bb149df1c53f16
author Bill Yi <byi@google.com> 1507446691 +0000
committer android-build-merger <android-build-merger@google.com> 1507446691 +0000

Import translations. DO NOT MERGE
am: 87c4d55ccb  -s ours

Change-Id: I5884b9fbc3d2385c8aac8fe4612aec6a69ccdcb7