tree ff4d8269f69130c37c210241887d5be7a65617dd
parent 0baa3b46156805d5875867c55290b4113f4b61b4
parent 62c2a7337b60b60ab0204572a792e88f9d99684e
author Geoff Mendal <mendal@google.com> 1430319071 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430319071 +0000

am 62c2a733: (-s ours) am 6b960a9e: (-s ours) am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '62c2a7337b60b60ab0204572a792e88f9d99684e':
  Import translations. DO NOT MERGE