tree 33f4eb1e60e0d2e481d36a323062603823ab079a
parent 6f1207c1f192792c58088b40914b59b2d0e64623
parent 15ceddaba5e616bc47799712ab54fe09506a1a85
author Bill Yi <byi@google.com> 1513878340 +0000
committer android-build-merger <android-build-merger@google.com> 1513878340 +0000

Import translations. DO NOT MERGE am: 87741d6082  -s ours
am: 15ceddaba5  -s ours

Change-Id: Ic868c570111ba3292afe7f34d6e0b615f05a1c44