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