tree efb9c1dff67167d93aa6a3d5c19968786593710b
parent 1ba5a20709d84308c29a5164640d82ce2956d89a
parent ffc2682a9784e03d7cc9943f4f408255f8468b96
author Michael Jurka <mikejurka@google.com> 1353119246 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353119246 -0800

am ffc2682a: Fix NPE

* commit 'ffc2682a9784e03d7cc9943f4f408255f8468b96':
  Fix NPE