tree 8067b3064960d84569f6c88e4f2b0b24a7bc5e51
parent c392888df752479ffaeee2fa9e624d71ce2a4618
parent 9839965b25922c229dbbf326d2ff84c598d4e3d5
author Bill Yi <byi@google.com> 1499742987 +0000
committer android-build-merger <android-build-merger@google.com> 1499742987 +0000

Import translations. DO NOT MERGE am: 28b67f8eea  -s ours
am: 9839965b25  -s ours

Change-Id: I0b93748069282ecd14fdcba5341c961913df0432