am bfbd2bcd: am fb745d27: am 001e5242: Merge change Icccbd889 into eclair

Merge commit 'bfbd2bcd0f15f9b709275a85b444c8fd7ea6192d'

* commit 'bfbd2bcd0f15f9b709275a85b444c8fd7ea6192d':
  Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.