am ea009041: (-s ours) am a41a4083: (-s ours) am 5054aebd: (-s ours) Import translati...
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)
commit4ce453ea72877a16f4caa80ba4b8a7fc9119337a
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parentd247d86085cf4385e6de2822f55da88376ca165d
parentea009041cdc23781d8b91eb65d8c537fff610ccb
am ea009041: (-s ours) am a41a4083: (-s ours) am 5054aebd: (-s ours) Import translations. DO NOT MERGE

* commit 'ea009041cdc23781d8b91eb65d8c537fff610ccb':