tree a209619f9c4e13b46519ec3f629679804f710457
parent 6b6ee7efc7109b3373400f4bad35d5fff2abb7b1
parent ccdd86e36afcd9e558ca1deb13695340a2683142
author Michael Jurka <mikejurka@google.com> 1321072839 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321072839 -0800

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

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