tree d2fe7a3ef33724a7e8a39aed887a011a6366a648
parent 35401bcb1d8adc4ad4c6bda1c550c5e94bcc1247
parent 845a619649cfefe2753fb0f5e15411d32d19ee77
author Bill Yi <byi@google.com> 1505596594 +0000
committer android-build-merger <android-build-merger@google.com> 1505596594 +0000

Import translations. DO NOT MERGE am: 1f1e95f0aa  -s ours
am: 845a619649  -s ours

Change-Id: I87b139166d54da6b193e9aad6f8856834a8b0ec1