am cd3a74b3: (-s ours) am 5bafb68f: (-s ours) am fc6d1ead: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Fri, 27 Dec 2013 04:04:48 +0000 (04:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Dec 2013 04:04:48 +0000 (04:04 +0000)
commit1b3a7274c1c54974b536b999b5e60228fd6a922c
tree8acc285e3c0688b50840bb525668609eb7ff4cf7
parent4ff1765c9660b2e1288560e94b7a208170bdd810
parentcd3a74b38ec9bb2b6fb20184c3be5abc10366a6a
am cd3a74b3: (-s ours) am 5bafb68f: (-s ours) am fc6d1ead: (-s ours) Import translations. DO NOT MERGE

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