tree f2000824a8b9dff554db42c53faf3ab46fc133a6
parent 3ed236df58e082537c2b39f4a8bc164016e259cc
parent 9d3e95665647dbd4dc4675bef1eada918ca598d3
author Michael Jurka <mikejurka@google.com> 1321056077 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321056077 -0800

am 9d3e9566: am 0e444be6: am fd99e777: Merge "Fix NPE that occurs with poorly behaved widgets" into ics-mr1

* commit '9d3e95665647dbd4dc4675bef1eada918ca598d3':
  Fix NPE that occurs with poorly behaved widgets