tree 93f682e1889e9ec28b8502fc48b355c74b7b81af
parent 8c0e6bcc2e3d91768f92cf2d4bbdbb0231a24091
parent dcd3a578ac71eb766f2c223213ea441ef1ba0c75
author Baligh Uddin <baligh@google.com> 1412624653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412624653 +0000

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

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