tree f2000824a8b9dff554db42c53faf3ab46fc133a6
parent c450f3d038dfa6e4278ebca91115c26a58069ad7
parent 0e444be63f15cd5d8b01ac285a91e762770e3f97
author Michael Jurka <mikejurka@google.com> 1321048753 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321048753 -0800

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

* commit '0e444be63f15cd5d8b01ac285a91e762770e3f97':
  Fix NPE that occurs with poorly behaved widgets