tree 55bebd844cd8e1cde6572af39a0f732f99fb36f8
parent 2a1912971849b929dc2e4ec8d6368f477b1fddae
parent d6e863a19a631fd0003f96d507a21863fe973caa
author Baligh Uddin <baligh@google.com> 1388080797 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388080797 -0800

am d6e863a1: (-s ours) Import translations. DO NOT MERGE

* commit 'd6e863a19a631fd0003f96d507a21863fe973caa':
  Import translations. DO NOT MERGE