tree a209619f9c4e13b46519ec3f629679804f710457
parent bb807d9ee64ab61ccdd91fbc83f33344f3cb3c2f
parent 8459814118ba029cdb41b61b608a57213413da81
author Michael Jurka <mikejurka@google.com> 1321116864 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321116864 -0800

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

* commit '8459814118ba029cdb41b61b608a57213413da81':