tree c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0
parent f294cdeb27ca38d5026f993f4d2abf690a78b9b4
parent 0277a42568b8223db95bcbe004a6a8d9576ee5d9
author Bill Yi <byi@google.com> 1482394084 +0000
committer android-build-merger <android-build-merger@google.com> 1482394084 +0000

Import translations. DO NOT MERGE
am: 0277a42568  -s ours

Change-Id: If66e092903c2f532c4473359e5e792de5a17d327