tree 4c9ee539b65c6b95146636f67881e3eb6c2e918f
parent 3d763e258b6643d29a495b5dfb1cb376e6b61f87
parent 521b85f4e60ad5058662b59ba5986edf3f7538ea
author Baligh Uddin <baligh@google.com> 1384969309 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384969309 -0800

am 521b85f4: (-s ours) am 853251e7: (-s ours) Import translations. DO NOT MERGE

* commit '521b85f4e60ad5058662b59ba5986edf3f7538ea':
  Import translations. DO NOT MERGE