tree 2c0ea52874e956681155d34118d2515410269eb6
parent d171aaeb200c74c6ae72d6619e31290cb8052cfc
parent b65107105e2ff2ecf59a802d8f1e9c35bbc66476
author Bill Yi <byi@google.com> 1470780896 +0000
committer android-build-merger <android-build-merger@google.com> 1470780896 +0000

Import translations. DO NOT MERGE am: c3b4372304  -s ours
am: b65107105e  -s ours

Change-Id: Iba81a9a545c2f960f3babc45f5404380caf87247