tree 24d93cf8324d3e4a263a67778d1727d306263005
parent 3857dbe11c723795e9456e5934ca3a4a3513e4b7
parent 29bbd570fe36c55321a3cd9d84330dea9d2f1e10
author Craig Mautner <cmautner@google.com> 1384388618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384388618 -0800

am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev

* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10':
  Add null pointer check.