tree 808c80b05792ca55ee081cf6b84cb853441d0ead
parent d93337bd06d56bc5088b90a144680ebc637ccf6c
parent c2c40a19028ec18a9542f9bf5b2c354198b4c279
author Bill Yi <byi@google.com> 1481284992 +0000
committer android-build-merger <android-build-merger@google.com> 1481284992 +0000

Import translations. DO NOT MERGE
am: c2c40a1902  -s ours

Change-Id: I0511a4e65d824d4acd9dd3e62ee58e6f4f3fc597