tree b72acadb45a9697c72d53629ccd57289f6238d5e
parent 52097f5cc6c54f79afb0122271de6313ce64b431
parent c814031b354c7e8c44ef55c301d4ff1242a04d12
author Michael Jurka <mikejurka@google.com> 1353119884 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353119884 -0800

am c814031b: am aa01c088: am ffc2682a: Fix NPE

* commit 'c814031b354c7e8c44ef55c301d4ff1242a04d12':
  Fix NPE