am c4d1b2cc: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 16 Aug 2013 00:31:34 +0000 (17:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Aug 2013 00:31:34 +0000 (17:31 -0700)
commitfece79d81ad50ddb5be4e0172d87d1438caa9e8e
tree7ec9bafab371f904e473327cbcec01bf137ee7e9
parent310510ad4e563563fde6f5186984b84c58f5be55
parentc4d1b2cc3c7fd3b043961f0110ef1bf6f0a4a505
am c4d1b2cc: (-s ours) Import translations. DO NOT MERGE

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