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

* commit '128213967bddd8f0190baac3494de33d7792b7e9':
  fix density sample to state density type rather than screen size