tree 8c9eab74eb53721c094aab6b65e9dcd989ae0ba2
parent 42dc0c256220496743a2532b7d51823d1d4d65d9
parent 8dafc8e834036ffded3644ba06ad4164ee7e755f
author Baligh Uddin <baligh@google.com> 1368114839 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368114839 -0700

am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE

* commit '8dafc8e834036ffded3644ba06ad4164ee7e755f':
  Import translations. DO NOT MERGE