am b9c40a65: Merge change I5d30aa18 into eclair

Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-plus-aosp

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