tree 2f4545468bdcdf55952b32b86b2625f495aa14e5
parent fac4bdd475b80a58574182c22ddcf6e4b8db084b
parent 8bea5f74499ea32dcf9775bfa62fdd9440c20f8f
author Michael Jurka <mikejurka@google.com> 1295248024 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295248024 -0800

am 8bea5f74: am f3fe6820: Merge "NPE fix" into honeycomb

* commit '8bea5f74499ea32dcf9775bfa62fdd9440c20f8f':
  NPE fix