tree 9a643f2fcb3d0269e860ff5064f6a2ec7591915b
parent 04fa8a88f1731c6b39ca0190051d7de0f3560e0a
parent 124cb6d29b171ccefab75fb97aeb8c3818063a0f
author Bill Yi <byi@google.com> 1509337739 +0000
committer android-build-merger <android-build-merger@google.com> 1509337739 +0000

Import translations. DO NOT MERGE am: bb8bb2c214  -s ours
am: 124cb6d29b  -s ours

Change-Id: Iccd4b3c61258900dff77e59ebf33dfbee590f0a8