tree b2ead697ad9ab1332f3f652944368a306a11da99
parent 5947989fdb447b12fa9cc7140ee88afaed9bdfea
parent 738d76456d027daa0474c61030f46174fc167eb5
author Bill Yi <byi@google.com> 1522481442 +0000
committer android-build-merger <android-build-merger@google.com> 1522481442 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 693df84856  -s ours
am: 738d76456d  -s ours

Change-Id: I15da7e22587de4eca1398a3600f1e38857758da8