am b148e621: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 15 Sep 2013 03:05:33 +0000 (20:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Sep 2013 03:05:33 +0000 (20:05 -0700)
commit68599af02c7d7b6a022916a6b50c973aaae87a02
tree3e844075477ea5881924a277a2ebb41cd36fa4fd
parentdeccda2ffb7b92eceb5f8b1f2af37abf141404c7
parentb148e621419b938daae0bee81c9b25341e1d297a
am b148e621: (-s ours) Import translations. DO NOT MERGE

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