tree 77f07b8a0d4aeb0ff8ad0badf69cab797ce415ef
parent e4b03a9c2a467b1bc088962e055092c76a5f7ad5
parent 6de95261c619d53f3e7b431fd17995e73928571e
author John Grossman <johngro@google.com> 1345825343 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345825343 -0700

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

* commit '6de95261c619d53f3e7b431fd17995e73928571e':
  Add a missing NULL check.