tree 16059e1abe3c3b71b7aad82ad50a7b92992e5328
parent eeccf5817ee2392541a9b7f22a1cd507e8b91c32
parent 761f04e26a1639de4702a1f9965d9bc8f6c38723
author Bill Yi <byi@google.com> 1481216621 +0000
committer android-build-merger <android-build-merger@google.com> 1481216621 +0000

Import translations. DO NOT MERGE
am: 761f04e26a  -s ours

Change-Id: I6ee5220820f8ad34d708c8b44579721c6601a064