am f36a2bb5: Merge change Ibeb22f37 into eclair

Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp

* commit 'f36a2bb59b846545946124124d3290bd3eec44f0':
  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