tree dde629699256a2a0410bcdd73f47d87c8f9ffed2
parent eee38701b5262d2f5acc1ddc96efccf53220fa3d
parent a77aa847f89bead89f55dc032156057ff63942d2
author Bill Yi <byi@google.com> 1506963903 +0000
committer android-build-merger <android-build-merger@google.com> 1506963903 +0000

Import translations. DO NOT MERGE am: 45de16dde5  -s ours am: a8c4c7aa94  -s ours
am: a77aa847f8  -s ours

Change-Id: Iad25d5ad2bdda26aba5a49bf7a118d86d8eb0b2d