tree 5688c3eb3b000cd5d57c2540216c3918ee9be6a4
parent 94a5a33ad04247d25b4995b00c4c4f458911a3a9
parent 67008a598da8cc73b035bbc93b25166b1c058a89
author Geoff Mendal <mendal@google.com> 1437574217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437574217 +0000

am 67008a59: (-s ours) am 158ce5ce: (-s ours) am 689721da: (-s ours) am 77b6b0eb: (-s ours) Import translations. DO NOT MERGE

* commit '67008a598da8cc73b035bbc93b25166b1c058a89':
  Import translations. DO NOT MERGE