am bafc8dcf: am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev

* commit 'bafc8dcf690776ec7fdcf26518f3aff47724871d':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"