tree a209619f9c4e13b46519ec3f629679804f710457
parent 8130af31dd7d799e63a6d3f64ddef2171059ba33
parent 0527f9444ede99bfc543a38f6ccdcbcb1e1282ae
author Michael Jurka <mikejurka@google.com> 1321072634 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321072634 -0800

am 0527f944: (-s ours) am b5537f7d: Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0

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