tree 5910e05e5f5dc06707fd01a0467034a2d051db2b
parent 5696ff7b970613f180299ca6c9b4f1ab48ea6c4f
parent 157b11937f12076cde37b34169c9b3ac33223825
author Bill Yi <byi@google.com> 1470782025 +0000
committer android-build-merger <android-build-merger@google.com> 1470782025 +0000

Import translations. DO NOT MERGE am: f94915ecff  -s ours am: 22cbb12e04  -s ours am: d7864dcef8  -s ours am: 9ee7b1f6ee  -s ours
am: 157b11937f  -s ours

Change-Id: I27d0bac9e8fa8854a1e9a8d123ae32af95aef819