am fa40889f: (-s ours) am 1b1c5777: (-s ours) am 7460b6e0: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Wed, 29 Oct 2014 09:55:34 +0000 (09:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 09:55:34 +0000 (09:55 +0000)
commit34587f7c73253ae0c0d397120c2db706e7761911
treedba16217600dd2208b2814f59ede112b2032daa8
parent2caf27ceb645b942347bd67d904ab46e14112f3d
parentfa40889f1034b221489903d80d9f12337f9f0320
am fa40889f: (-s ours) am 1b1c5777: (-s ours) am 7460b6e0: (-s ours) Import translations. DO NOT MERGE

* commit 'fa40889f1034b221489903d80d9f12337f9f0320':