am 50391c0e: (-s ours) am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:40:37 +0000 (14:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:40:37 +0000 (14:40 +0000)
commit55e9d0fbbec6561ee0eb616876b0c6641cc39af9
tree383bfb90e1940881c4f125f4b595ef1d2ad44e5a
parent9c1c0f98aa1ccd74dfba56ac3b4164ba88a00e43
parent50391c0e2bfd746cff84d23a430d213c8ead92f3
am 50391c0e: (-s ours) am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '50391c0e2bfd746cff84d23a430d213c8ead92f3':
  Import translations. DO NOT MERGE