am a41a4083: (-s ours) am 5054aebd: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 18:03:42 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 18:03:42 +0000 (18:03 +0000)
commitea009041cdc23781d8b91eb65d8c537fff610ccb
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent50685abb8cb91128a6eda2c2e1a063c4b48d3732
parenta41a4083c3509b4e7c13bf5a0dfab9d3bc017a53
am a41a4083: (-s ours) am 5054aebd: (-s ours) Import translations. DO NOT MERGE

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