tree d4e198a0e3ed1b688246313ec14af3e933a5d9ae
parent a6c56b6f6bf6efb976a448e08a1d4a34adb305fa
parent 7961fd9b0612979b9b68cc8877300a884fa0cc58
author Bill Yi <byi@google.com> 1502554647 +0000
committer android-build-merger <android-build-merger@google.com> 1502554647 +0000

Import translations. DO NOT MERGE am: ccac636733  -s ours
am: 7961fd9b06  -s ours

Change-Id: Id441eb7bd0fc2c62900fe99d3276019fac776a78