tree bba1c61e3a35f7dc5db56f3cf8f9621336e476a2
parent d4d11c5dc8d75ab6fc57ef92ca4b58d59058b117
parent 5c965d7a0e64cc6880e7702e936dc4dcbd5b615c
author Bill Yi <byi@google.com> 1508519591 +0000
committer android-build-merger <android-build-merger@google.com> 1508519591 +0000

Import translations. DO NOT MERGE am: 9223c18a08  -s ours
am: 5c965d7a0e  -s ours

Change-Id: I74df93b22f1a021334d30556e22d0efc63f3d610