am 49ff1e6c: am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread

Merge commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621'

* commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.