tree b7a3edbd188949a6e7107a7e7575871220e1d481
parent b1decec875f37751f49fef2fab1bc546cca4687d
parent 8815eed22d581a19fd38d3bdfb5fc5cf6c292f75
author Geoff Mendal <mendal@google.com> 1422890441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422890441 +0000

am 8815eed2: (-s ours) Import translations. DO NOT MERGE

* commit '8815eed22d581a19fd38d3bdfb5fc5cf6c292f75':
  Import translations. DO NOT MERGE