tree f72798feb0b8b7f7ceac0ab9739bc00792356b35
parent 910eeec0a488aeb13dc3443ec5c994f5d78e4400
parent 8573690d9d9d4f992011150eba1b0fe93509e47c
author Bill Yi <byi@google.com> 1491122354 +0000
committer android-build-merger <android-build-merger@google.com> 1491122354 +0000

Import translations. DO NOT MERGE am: 1c7da75b8a  -s ours
am: 8573690d9d  -s ours

Change-Id: I8b25567188180e55b18c996d7fe6a2b725960ae4