am 900a1c1c: am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb

* commit '900a1c1cf1b6cbf6672f2261f7f65ffce65ce02e':
  fix density sample to state density type rather than screen size