tree 340ef0efc28497984466a9eb774630f8eed324bd
parent a2c8a7b5739c1febf8ffbf9461334343bdadab16
parent 06ca9b90e664235d79304a4611529c09256d060e
author Dianne Hackborn <hackbod@google.com> 1309209313 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309209313 -0700

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.