tree a209619f9c4e13b46519ec3f629679804f710457
parent 930e8f2c3eb850a653617ff1c8695e6557222527
parent b5537f7d987006b4f0fb773fb28ff64ad502f242
author Michael Jurka <mikejurka@google.com> 1321072492 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321072492 -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