am 2a7b0b99: am b9c40a65: (-s ours) Merge change I5d30aa18 into eclair

Merge commit '2a7b0b996fba30cb57062559773e8855c8cf1b9e' into eclair-mr2-plus-aosp

* commit '2a7b0b996fba30cb57062559773e8855c8cf1b9e':
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
tree: a25c183b9ae2c75fb2c0c3dc5002a65928e1bd17
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE