tree 6367992681dfe95b532d32eae2285f77cf5df29f
parent f605bd2238db39f8afaa7e4225b0c3b7922586a0
parent 390ae07820eeddb0541836740e204590b3d4ab3c
author Bill Yi <byi@google.com> 1505595448 +0000
committer android-build-merger <android-build-merger@google.com> 1505595448 +0000

Import translations. DO NOT MERGE
am: 390ae07820  -s ours

Change-Id: If9213d08a861859b2ba6836c4479bccf80d3b10b