am 84a8ddea: (-s ours) am c056b456: (-s ours) am 890cfb8a: (-s ours) am eb140c18...
authorBaligh Uddin <baligh@google.com>
Wed, 1 Oct 2014 23:00:15 +0000 (23:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 23:00:15 +0000 (23:00 +0000)
commit6617e3233ae082a117067ab4988147326b70a87a
tree8b8c7dc1e76c54af9ad78e93ba873068df73ec2b
parent1eb8eb9cf5bf5fbbfaa06ccc1d508b7416b7b814
parent84a8ddea1c4cdebd287e25783e9a39fa3182f139
am 84a8ddea: (-s ours) am c056b456: (-s ours) am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE

* commit '84a8ddea1c4cdebd287e25783e9a39fa3182f139':
  Import translations. DO NOT MERGE