tree b7b1482131499bf2cd3dc134d3ba1eec176ed215
parent fd3e7b97da2825ac5400f21bc5b3bbb8e80341b8
parent 721c44e83b68c803403a6e4c486bb61b3adfe78b
author Bill Yi <byi@google.com> 1501903070 +0000
committer android-build-merger <android-build-merger@google.com> 1501903070 +0000

Import translations. DO NOT MERGE am: 5b0c2dacfc  -s ours am: 0e8178e51c  -s ours
am: 721c44e83b  -s ours

Change-Id: I77a1dce03caa5c30957eb74fd195a72f0fe822df