tree 0fa1f4de370b829394d609bc2b74e836f277ca61
parent a139810632cd3dca6cf260c144b097869ba72938
parent f6f526d7ec8657fc5e76dbe5ee08c4c2717376d8
author Bill Yi <byi@google.com> 1495520879 +0000
committer android-build-merger <android-build-merger@google.com> 1495520879 +0000

Import translations. DO NOT MERGE
am: f6f526d7ec  -s ours

Change-Id: I6a966af5ac3febaf88ae98377cf826403f8691c5