tree 24f5a3a1fa9de0ffc7c201935edfde9c06738c1b
parent 9f05e68ea5130d9de4688d329346deb48a115e9d
parent 5f76e0c11d7ddf81499e557384a1cb15aadc4575
author Bill Yi <byi@google.com> 1506629953 +0000
committer android-build-merger <android-build-merger@google.com> 1506629953 +0000

Import translations. DO NOT MERGE am: 47749a01d7  -s ours am: 27d4c36a3d  -s ours
am: 5f76e0c11d  -s ours

Change-Id: I231ba5e0ac321a50cad0de5c496f84665ce8b89e