tree e868fff07182c5df89d4b5c92d19da656c429131
parent 8d98634efabc66372df550bb17b81c1dad992cac
parent 10251a3340b68f4b0fa42e76e689d5cae3adb39c
author Bill Yi <byi@google.com> 1517074296 +0000
committer android-build-merger <android-build-merger@google.com> 1517074296 +0000

Import translations. DO NOT MERGE am: eb9166bc21  -s ours
am: 10251a3340  -s ours

Change-Id: Ia6d220970885a41e9a1dcd51f5729f732792bc40