tree bba1c61e3a35f7dc5db56f3cf8f9621336e476a2
parent 721c44e83b68c803403a6e4c486bb61b3adfe78b
parent 379b935e2e05c8550c5ead5fb2447ee67588453f
author Bill Yi <byi@google.com> 1502039026 +0000
committer android-build-merger <android-build-merger@google.com> 1502039026 +0000

Import translations. DO NOT MERGE
am: 379b935e2e  -s ours

Change-Id: Id7eae2284f2cb250d1f0b922cf77a5c666e2c8fc