tree 8c2fecdc946d33d1f49a2d9c6e559a30135ae051
parent d88e95831e70d1f3d3e6eb5f0265a77b47407f0b
parent a5ecec62e634d6bf4819d1365bd2d19202d3b9b8
author Geoff Mendal <mendal@google.com> 1413226275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413226275 +0000

am 7b7f0def: (-s ours) Import translations. DO NOT MERGE

* commit '7b7f0def6ee1c41a2a6cab74b9247dca1ef15b88':
  Import translations. DO NOT MERGE