tree 4636300d89a3901ef80da8b87db3d2c28626f270
parent fa25ce0fe4365f3f18bf3ce83a431905453ba536
parent 505a717a4bf80a58ef95c5d75d3fb0613e1e5aa8
author Bill Yi <byi@google.com> 1470994782 +0000
committer android-build-merger <android-build-merger@google.com> 1470994782 +0000

Import translations. DO NOT MERGE am: ab3feb2c95  -s ours
am: 505a717a4b  -s ours

Change-Id: I5d36313dfee93f7bbd4e0c0d2624e6ead1bc8b44