tree f4c11a416343e8a63953cb3563957172c7d995f0
parent 2fa47128dadcd2ee41fe45d4b4e6751dd78447d6
parent eae76daba22614f8701299bbb7f74ceaf3f89c9b
author Bill Yi <byi@google.com> 1508271892 +0000
committer android-build-merger <android-build-merger@google.com> 1508271892 +0000

Import translations. DO NOT MERGE am: 5453fad5c7  -s ours
am: eae76daba2  -s ours

Change-Id: Ie2fc2980d809957d5fee9fd21368d665b8150548