tree 4d81455d0d40a0d067701ed3a26279d796d5af9a
parent ebb3ea0cab433ee8f19ccd95767df2b666474acd
parent ee4f8772c1fbe6c8383f5d55a75a15f489f4373b
author Eric Fischer <enf@google.com> 1339610001 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339610001 -0700

am ee4f8772: (-s ours) am b725b483: Import translations. DO NOT MERGE

* commit 'ee4f8772c1fbe6c8383f5d55a75a15f489f4373b':
  Import translations. DO NOT MERGE