am 99f7b56f: Merge change Iefdb6f97 into eclair

Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-plus-aosp

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
tree: 4cbc4dc7b3c053cf9f5dac1db1cccba7ce3a10a0
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE