tree 54837ccde537f0878843295e7adfee349dfb17c3
parent fbd14ac287f22ff05c7538a3122484272861f620
parent 64a3cbf864785d3817e1f698505790426fc5b0b7
author Michael Jurka <mikejurka@google.com> 1307651550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307651550 -0700

am 64a3cbf8: (-s ours) am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2

* commit '64a3cbf864785d3817e1f698505790426fc5b0b7':
  DO NOT MERGE temp fix for NPE