tree 5aafdcb3156dad4e99bf736e79282f93c3a8b15d
parent f552faf107c4b9206ae63f569eafbd893d513077
parent 988069df8a8165f50f393d5104822036374bccb6
author Bill Yi <byi@google.com> 1481040312 +0000
committer android-build-merger <android-build-merger@google.com> 1481040312 +0000

Import translations. DO NOT MERGE am: 2a1d7f9dd5  -s ours am: e1af21d173  -s ours am: 02a2befe44  -s ours
am: 988069df8a  -s ours

Change-Id: I91743d26f1480cb555a09c2a20ab8f0347bfbfba