am 302eaa74: (-s ours) am ac5ba830: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:31:01 +0000 (14:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:31:01 +0000 (14:31 +0000)
commitc502ca7dc8f36d4c41e1c3b3b1a8a60408fac08c
tree6ba8baa83accc32c603cf7c83ff68c87f46d8472
parent40d5a30be2812241deac1527b22237cbd40589c6
parent302eaa74157841b5a9119d636f13a66e290c89ad
am 302eaa74: (-s ours) am ac5ba830: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '302eaa74157841b5a9119d636f13a66e290c89ad':
  Import translations. DO NOT MERGE