tree 8d4bb5c0feb92d67aaec43e9e24604dae2400c0c
parent 005c75cc49378be405e0bc7184cada064e616bce
parent 211e1d4227719c41bd01ca1992971d39c6fe9e49
author Brian Colonna <bcolonna@google.com> 1320852912 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320852912 +0000

am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0

* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
  Fix 5514230: preventing null window token from occurring