tree 564b864e9d3a5acf2592232190d2fa4e82ab2f40
parent b9c76f3224611396746261a25ecf44bac41c113d
parent 85dec65f63fca838a496331c4c6b015acbceacd0
author Michael Jurka <mikejurka@google.com> 1321048163 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321048163 -0800

Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0