tree ab5b24c4eccd40c48088f7819dd3837be6c9846d
parent c3ae754ef636ca4d73a6a3582440ff2fc204368a
parent 97087f3ab3b33b2d4af8e27f4a06e7fa047185a7
author Bill Yi <byi@google.com> 1505360016 +0000
committer android-build-merger <android-build-merger@google.com> 1505360016 +0000

Import translations. DO NOT MERGE am: 6d0128a056  -s ours am: 779170d5bb  -s ours am: 200e1ef67f  -s ours am: 0b4f643258  -s ours
am: 97087f3ab3  -s ours

Change-Id: Iabd80dfa0398bf13bb6c357697cc49f11183f379