tree 0d265572bd4eb44899293827717306636d1aecf6
parent d1605438b26dfc38234d73f7fdd4662eddcbb925
parent 3335973a6710135a299a615c7a48555c51586e97
author Geoff Mendal <mendal@google.com> 1426181126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426181126 +0000

am 3335973a: (-s ours) am f02db6b7: (-s ours) Import translations. DO NOT MERGE

* commit '3335973a6710135a299a615c7a48555c51586e97':
  Import translations. DO NOT MERGE