tree bba1c61e3a35f7dc5db56f3cf8f9621336e476a2
parent 194718892ccbb7ccf4336719390b224d6944f590
parent 4c355d746df3caf2ccac7a401d586706843783be
author Bill Yi <byi@google.com> 1501902168 +0000
committer android-build-merger <android-build-merger@google.com> 1501902168 +0000

Import translations. DO NOT MERGE am: 5b0c2dacfc  -s ours
am: 4c355d746d  -s ours

Change-Id: Idcc09f77fdd9019c6c1a6f814ef314f95d5a9fa0