tree d8d2a645079e7e380315ac3c207fbaa967c7340b
parent f1d3a0fc08c827c47ed83c33e37be20c0733d3eb
parent eba4fb66c0bfb28f55185fc38da1e9a123f296c8
author Baligh Uddin <baligh@google.com> 1389071634 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389071634 -0800

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

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