tree be7a17e83f4274c627f9101fa74e0eaa6ceec5c9
parent d3530a0fa96b0cef68d13a1a769983de34330311
parent a016baa7c82df2b0aebbbea5ca8f4113f6d1671b
author Baligh Uddin <baligh@google.com> 1355190297 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355190297 -0800

am a016baa7: (-s ours) am 422a1164: am a2d3a036: Import translations. DO NOT MERGE

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