tree b54fdd94e906568e1346b24d240e2de99f85d319
parent 93b92d0895f86fddf270b4861282b75c8e455ce3
parent f47cc890e9475b31acd1416de57d32062d395e9e
author Baligh Uddin <baligh@google.com> 1391214344 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391214344 -0800

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

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