am c11548ea: (-s ours) am b4f1c7f1: (-s ours) am eb140c18: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Wed, 29 Oct 2014 09:55:32 +0000 (09:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 09:55:32 +0000 (09:55 +0000)
commitc64b07974e8064561d5235ca69a4da3dc536e224
treedba16217600dd2208b2814f59ede112b2032daa8
parentb42b9fb8ef05909a6944f05f7d2ba4301e5b874f
parentc11548ea62820a1f5fbbc0a60ae254f7de6247a6
am c11548ea: (-s ours) am b4f1c7f1: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE

* commit 'c11548ea62820a1f5fbbc0a60ae254f7de6247a6':