tree 2e8aad3ece336681c1d8ae67563ce9f11b30d69f
parent 357bff46b83fbe72b09edc490b528b8a1ce6ba9b
parent 92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae
author Romain Guy <romainguy@google.com> 1270582996 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270582996 -0700

am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo

Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken

* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
  Correctly resize dialogs when measured in WRAP_CONTENT