tree 6367992681dfe95b532d32eae2285f77cf5df29f
parent c59dc21a43f9adf4d51748d426819df15bb1f467
parent a6aa2e0017c55defbed57db9d67b98e7bbed1457
author Bill Yi <byi@google.com> 1507446098 +0000
committer android-build-merger <android-build-merger@google.com> 1507446098 +0000

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

Change-Id: I49b5b34c95cacbc10dfd0283bb2831959cfacb88