am 84eb12bc: am f36a2bb5: Merge change Ibeb22f37 into eclair

Merge commit '84eb12bc7ef92ce04d43e1c7ce0319768e3f247e'

* commit '84eb12bc7ef92ce04d43e1c7ce0319768e3f247e':
  Call the proper variant of markAsContacted.
tree: 6891403aad3b1f4996e41ba2949a0d33959ce5df
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE