tree e867f5f445448fa3e60ca73c0437d1998cfe7e9f
parent eeca3db9118437ef8ee7ea92a622801bc90c7de2
parent 8b455d0db5d22d2f029e196a988d1f87a0e0465f
author Bill Yi <byi@google.com> 1479943430 +0000
committer android-build-merger <android-build-merger@google.com> 1479943430 +0000

Import translations. DO NOT MERGE
am: 8b455d0db5  -s ours

Change-Id: I41374014277aa9c64aadc63711f74dc8c659142e