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

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

* commit '65d35362e18cfb7056c15a520a275638184b90fa':