tree 8d4a89386f6c30cefaf509479a3abdf41de04af4
parent 8375ebee370c76856c83e975ef563146123ff86e
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: Ib54432253ac2e1db0f9a59fbf18c1fb4ce8dfe04