tree cc177233e85c014d6a656c45517fd8a9f6e840ec
parent 67ca304991c07d54cdcae65d12449d11a3a9d44c
parent 19ad508a58a60faa040cadb2ff7065e5aeea4151
author Bill Yi <byi@google.com> 1486115371 +0000
committer android-build-merger <android-build-merger@google.com> 1486115371 +0000

Import translations. DO NOT MERGE am: eb37d17be4  -s ours
am: 19ad508a58  -s ours

Change-Id: Ie9e99662c50807cd972e2a5588bf45a40b98c375