tree b1463ab1fd1b2a557cfd08ef289bff12f87570ae
parent cf4b908c511715ef9dea6cb33b07206923708e14
parent 37327a1ffcdc3eaa8fe7b32dd9fec0a319c411ee
author Baligh Uddin <baligh@google.com> 1412023623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023623 +0000

am 37327a1f: (-s ours) Import translations. DO NOT MERGE

* commit '37327a1ffcdc3eaa8fe7b32dd9fec0a319c411ee':
  Import translations. DO NOT MERGE