am c478796c: (-s ours) am 8f3c6521: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 17:51:06 +0000 (09:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 17:51:06 +0000 (09:51 -0800)
commit7f13f61be97d5774516be544239bc0a0338cfb47
treeb32abf080fb969f005430198c6c5f561e2149883
parent9ec7f19fad500366049b4e470ac3a0622aee556e
parentc478796c0f999a4d91bfe3d605412e93dfa2868f
am c478796c: (-s ours) am 8f3c6521: (-s ours) Import translations. DO NOT MERGE

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