Merge change 26856 into eclair

* changes:
  Make the new ContactsContract APIs public.
tree: eef7da401bf461b8cd366bf78c9cb252cabb0f3c
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE