tree e8f25bc0d8212cbc36dbf99be1247834b8a481ea
parent 8c9aa3c15a9efc95ad36408f7faf8a2df7a8f4ac
parent 2b7b76c018cab25cae2369ac5431a0bc4a4e33d5
author Bill Yi <byi@google.com> 1475134782 +0000
committer android-build-merger <android-build-merger@google.com> 1475134782 +0000

Import translations. DO NOT MERGE
am: 2b7b76c018  -s ours

Change-Id: I834461c358294cc7c6e04cc53b0c04804af799be