am 1806afb2: am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev

* commit '1806afb2c48eefea8a881fece8dc5233d403d649':
  Add a private method to retrieve the header list from PreferenceActivity