tree 48fd200b3b18d102215d4d799de7d540534c1c17
parent d978fb8192d41ca30b0c4affecb67c9e0812566d
parent 02b20df8950baf979e336139b24ca1b393e275b2
author Bill Yi <byi@google.com> 1471882387 +0000
committer android-build-merger <android-build-merger@google.com> 1471882387 +0000

Import translations. DO NOT MERGE
am: 02b20df895  -s ours

Change-Id: Ic95dbb727bcb714d7678b33cfe9d953769be3932