am e424b26d: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 25 Aug 2014 16:32:46 +0000 (16:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 16:32:46 +0000 (16:32 +0000)
commitd3ad7d4dd7157129c2cf485a5f1d3c396ddb98c0
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent3da05cbfbad836707db214ee9a5346527fb49373
parente424b26d46a821d151d88724b6b6d6afc8de4317
am e424b26d: (-s ours) Import translations. DO NOT MERGE

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