am c056b456: (-s ours) am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 21:11:32 +0000 (21:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 21:11:32 +0000 (21:11 +0000)
commit84a8ddea1c4cdebd287e25783e9a39fa3182f139
treedc7a2015cc6946c61dc348ff1a2048ab26075b1e
parent870ab30a0546f37791f0ac0299074406c387b890
parentc056b4560e2cea69c985186174ba463fcb093642
am c056b456: (-s ours) am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE

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