am 4802efe1: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 20:40:35 +0000 (20:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 20:40:35 +0000 (20:40 +0000)
commit1f55a53d53a10026bfdbf747cc70f7b7773d9e1e
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parentea009041cdc23781d8b91eb65d8c537fff610ccb
parent4802efe18bcb1a758433f552f53ae2c0759b45f5
am 4802efe1: (-s ours) Import translations. DO NOT MERGE

* commit '4802efe18bcb1a758433f552f53ae2c0759b45f5':
  Import translations. DO NOT MERGE