tree e2c4be394f6239fe42c162c9cdda9bdb1556c517
parent 08c2f8048f02eac6269a2f81ef3e1b6d23444b14
parent d6dd7c8a21e416d7c118517569a242ac7de6c696
author Michael Jurka <mikejurka@google.com> 1350662937 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350662937 -0700

am d6dd7c8a: Fix NPE

* commit 'd6dd7c8a21e416d7c118517569a242ac7de6c696':
  Fix NPE