tree 025e1248ffedb5243226d4c2fee22b92bc4dc633
parent 26a936abfebd12509dca627700dc59eb02de551a
parent 988255ea57790dfa4fbe6c8fc93a38aa0ad1a450
author Baligh Uddin <baligh@google.com> 1394161382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394161382 +0000

am 988255ea: (-s ours) am 0d445db1: (-s ours) am c5d3d025: (-s ours) am 61365506: (-s ours) am 366822da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '988255ea57790dfa4fbe6c8fc93a38aa0ad1a450':
  Import translations. DO NOT MERGE