tree e2c4be394f6239fe42c162c9cdda9bdb1556c517
parent 5c69a9cc21815a2b5f62162fc807adb796c5ca0b
parent eb91462f087028e2ce22552ba8ce4e17b9a4f9c1
author Michael Jurka <mikejurka@google.com> 1350663077 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663077 -0700

am eb91462f: am d6dd7c8a: Fix NPE

* commit 'eb91462f087028e2ce22552ba8ce4e17b9a4f9c1':
  Fix NPE