am 1f55a53d: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 18:53:21 +0000 (18:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:53:21 +0000 (18:53 +0000)
commit27e5060875c5c7f7daa16d38383227dcc957d7f6
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent4ce453ea72877a16f4caa80ba4b8a7fc9119337a
parent1f55a53d53a10026bfdbf747cc70f7b7773d9e1e
am 1f55a53d: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE

* commit '1f55a53d53a10026bfdbf747cc70f7b7773d9e1e':