tree 3f8390208591e33ed3344e88f98218de2f20ee47
parent 0ccf9bf55ce2429b40322b45040e977a0ad90cd0
parent faa256055d1eddee4685a641435dce5d682541b5
author Bill Yi <byi@google.com> 1508519900 +0000
committer android-build-merger <android-build-merger@google.com> 1508519900 +0000

Import translations. DO NOT MERGE am: fb2c23567d  -s ours
am: faa256055d  -s ours

Change-Id: I3a330b7e9f9354c35db935060f50a54514704a00