tree c688ac2063b1f3920885b812acc3951359d8fa50
parent aa40be0a1546bf5deee2de2e2f9bb50340139ec4
parent 6d02522461542f65c18725f3f2c6f24dcb801719
author Baligh Uddin <baligh@google.com> 1404683000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404683000 +0000

am 6d025224: (-s ours) am 1debb60a: (-s ours) am d88a3cb7: (-s ours) Import translations. DO NOT MERGE

* commit '6d02522461542f65c18725f3f2c6f24dcb801719':
  Import translations. DO NOT MERGE