tree b20753caf29f6ed4b7cd353b0c32772e2a638bdd
parent c0c152f81d9e7374a30f90d7ce576719d318fe98
parent e171593f9afb2b345257cc8e6599f8da9b3437c3
author John Grossman <johngro@google.com> 1345825481 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345825481 -0700

am e171593f: am 6de95261: Merge "Add a missing NULL check." into jb-mr1-dev

* commit 'e171593f9afb2b345257cc8e6599f8da9b3437c3':
  Add a missing NULL check.