tree 52692441980b65d099b8b990e2b6b55ef6ff80a5
parent 7508ef29dc4fd823048a3dfc4053a0dea2191c5c
parent 84c377f51a0995b2f70028df12abb9f98c44e915
author Baligh Uddin <baligh@google.com> 1381529007 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381529007 -0700

am 84c377f5: (-s ours) am 9c861f80: (-s ours) Import translations. DO NOT MERGE

* commit '84c377f51a0995b2f70028df12abb9f98c44e915':
  Import translations. DO NOT MERGE