tree a209619f9c4e13b46519ec3f629679804f710457
parent ec9a0619fe29780519f9ee50ff2827929601178b
parent b5537f7d987006b4f0fb773fb28ff64ad502f242
author Michael Jurka <mikejurka@google.com> 1321067844 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321067844 -0800

am b5537f7d: Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0

* commit 'b5537f7d987006b4f0fb773fb28ff64ad502f242':
  DO NOT MERGE Fix NPE that occurs with poorly behaved widgets