tree b847776f6317929036c446bc8fc8a671dfbc6ecf
parent 474ad848df9e0d5a9165f2f9e17eaec46d8c2df5
parent d7ad0ca037024d288d223e4f7f857500c1a146fe
author Bill Yi <byi@google.com> 1513883745 +0000
committer android-build-merger <android-build-merger@google.com> 1513883745 +0000

Import translations. DO NOT MERGE am: a829ea2a1b  -s ours am: 41c5dcaad0  -s ours
am: d7ad0ca037  -s ours

Change-Id: I38f45f8528bbf80c45d842f9c8fa045d6ea84626