am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb

* commit 'c831e3192ccd9b2cf69ec7c973005e578631da3b':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException