tree ee55a75ad8dd61305a4b705196ac5cdb2ca84920
parent 306c62dedbd1edf9c8c7c40104ece165be6fbf4b
parent 83b06dc359a96f6935bb64ffa16b4cb19d458ffb
author Baligh Uddin <baligh@google.com> 1387467002 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387467002 -0800

am 83b06dc3: (-s ours) am 631c46fd: (-s ours) Import translations. DO NOT MERGE

* commit '83b06dc359a96f6935bb64ffa16b4cb19d458ffb':
  Import translations. DO NOT MERGE