tree 32c6eb7e51b07678c1266fd5899e44931e070e0a
parent 9f8fd32d9569f35cde63aba62b918bc63516fcaf
parent 7e05669aba359d4e64fef1d2426eee4b605d9c8c
author Bill Yi <byi@google.com> 1499743168 +0000
committer android-build-merger <android-build-merger@google.com> 1499743168 +0000

Import translations. DO NOT MERGE am: 28b67f8eea  -s ours am: 9839965b25  -s ours
am: 7e05669aba  -s ours

Change-Id: Ib58bfa4519142c21b4f7440d0a269732172f9e16