tree 9faabdf81ef25bd802fd308d16cde7d89c44ba5a
parent 5677ba81d1bc69356f86d1ca2ebbf99a1c48abf3
parent 34ed20bc815a0625199db23f9c78f3a5ebef8b62
author Bill Yi <byi@google.com> 1491121704 +0000
committer android-build-merger <android-build-merger@google.com> 1491121704 +0000

Import translations. DO NOT MERGE
am: 34ed20bc81  -s ours

Change-Id: Idfa356ca0157a5e81d773e047ae343cdb875d41f