tree 31ef12a6bd9ef36e143d1c9f30877fae03d71c79
parent 1f699757b41408eddf6102b0dbabe0b08f7ac093
parent 409c2ee012aab0d2d01c64dcf76dc10db4cdfe78
author Geoff Mendal <mendal@google.com> 1413207585 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413207585 +0000

am 409c2ee0: (-s ours) Import translations. DO NOT MERGE

* commit '409c2ee012aab0d2d01c64dcf76dc10db4cdfe78':
  Import translations. DO NOT MERGE