tree 600aad0c01b67522349d0b2be421865f045c72f9
parent d4182381e65629b7406ef7420d09029b5654e479
parent f274ff65974b6f74d7d0008a0f3379b581e2cf7b
author Bill Yi <byi@google.com> 1494968429 +0000
committer android-build-merger <android-build-merger@google.com> 1494968429 +0000

Import translations. DO NOT MERGE am: 516aac32ae  -s ours
am: f274ff6597  -s ours

Change-Id: Iccc61328d92c89d0d6827ba7a7076176b262a0c3