tree 43e936c874ee9be69a48072502e9cb61561feb44
parent 83c70cf8ee6ff5912394ce9b3efc0bdea9401ae2
parent f44abc8e1bb0a958c0f8a04329f99d82683031e1
author Michael Jurka <mikejurka@google.com> 1307578540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307578540 -0700

am f44abc8e: am 6b32fc9b: Merge "DO NOT MERGE temp fix for NPE" into honeycomb-mr2

* commit 'f44abc8e1bb0a958c0f8a04329f99d82683031e1':
  DO NOT MERGE temp fix for NPE