tree 1c94eb418b3944b4a66f20431dbe9b1d10e02f53
parent 09c670db16a478ada863d4441fc17070b07339ca
parent 702965ef059a033c79f875337d3b1ce6bf2e78ca
author Baligh Uddin <baligh@google.com> 1414956740 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414956740 +0000

am 702965ef: (-s ours) am 717ed1e6: (-s ours) am bef50389: (-s ours) Import translations. DO NOT MERGE

* commit '702965ef059a033c79f875337d3b1ce6bf2e78ca':
  Import translations. DO NOT MERGE