am 06ca9b90: (-s ours) am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE.  Fix density compat mode." into honeycomb-mr2

* commit '06ca9b90e664235d79304a4611529c09256d060e':
  DO NOT MERGE.  Fix density compat mode.