tree ee5f48db14cf475c46d005e427c15982d25cee8e
parent 0bc13e576654cecd485f6158df46240d1787a518
parent 192f31d94bdabd5c16683a6f4be14c0825a7f4de
author Bill Yi <byi@google.com> 1513801993 +0000
committer android-build-merger <android-build-merger@google.com> 1513801993 +0000

Import translations. DO NOT MERGE
am: 192f31d94b  -s ours

Change-Id: I747f85b4ce0692df99ab522bf5fd59d790090070