tree b356e741d1d45a698ddf79780236915f211f20c4
parent cdcba9ce5f44cf4cad9e308919272db4e15e9717
parent 99131cf64253cf997d8ee6e356843e376a141846
author Geoff Mendal <mendal@google.com> 1445259868 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445259868 +0000

am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE

* commit '99131cf64253cf997d8ee6e356843e376a141846':
  Import translations. DO NOT MERGE