am c502ca7d: (-s ours) am 302eaa74: (-s ours) am ac5ba830: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:41:08 +0000 (14:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:41:08 +0000 (14:41 +0000)
commit30b9843111edfe957d136e45f8bff905806e5a36
treec074eadf42e9ae6b52851d5df8e2a937649d625b
parent710be7b27b7497290039de30249316613d31fc38
parentc502ca7dc8f36d4c41e1c3b3b1a8a60408fac08c
am c502ca7d: (-s ours) am 302eaa74: (-s ours) am ac5ba830: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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