am 2dafe771: Merge "DO NOT MERGE.  Fix density compat mode." into honeycomb-mr2

* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.