tree eef6054084446dbba99fd39dfee7162ae96672bf
parent 0575170cc4c061531ff867a44a62b38e9a4e7aa2
parent 0e06bddd566989d5c41b28ca45b538d43595059f
author Baligh Uddin <baligh@google.com> 1412532218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532218 +0000

am 0e06bddd: (-s ours) am a09e146b: (-s ours) Import translations. DO NOT MERGE

* commit '0e06bddd566989d5c41b28ca45b538d43595059f':
  Import translations. DO NOT MERGE