tree efb9c1dff67167d93aa6a3d5c19968786593710b
parent 14bad2ad9508e4bf48142e0302c970cb67550287
parent aa01c0882b8fcab73550546602b174bb36f72bce
author Michael Jurka <mikejurka@google.com> 1353119429 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353119429 -0800

am aa01c088: am ffc2682a: Fix NPE

* commit 'aa01c0882b8fcab73550546602b174bb36f72bce':
  Fix NPE