am f830b073: (-s ours) am 1ef5cd37: (-s ours) am bc405e76: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Thu, 19 Dec 2013 18:23:18 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 18:23:18 +0000 (18:23 +0000)
commit049a6c9cde90870d8cd15a5b07992d3adaf0e9b5
treefb3f82160d12fd97684a0808dff314cb4b17bb6e
parent6d69cc803a24bda824afd650b0dde91db87eb7b2
parentf830b07335bd2dd794b84507b5390f7d893fe428
am f830b073: (-s ours) am 1ef5cd37: (-s ours) am bc405e76: (-s ours) Import translations. DO NOT MERGE

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