tree e25fbefde1622d6812a841e62ca2503e94b8f407
parent 6da272816e4ed56233a92d00a9bf0e0d03e60533
parent 1cb518db18298601e112f3d027d108843c9964c9
author Bill Yi <byi@google.com> 1488263226 +0000
committer android-build-merger <android-build-merger@google.com> 1488263226 +0000

Import translations. DO NOT MERGE
am: 1cb518db18  -s ours

Change-Id: I153f77c028879baca0dcce006d47f455c5899714