tree da88d275823cf6341545bd984a25b1e900b95f8e
parent 6587045a844393a02736e1e1319f0332af4b823d
parent 1ef41605bbde97fb3979003a652fd365a0d034aa
author Cary Clark <cary@android.com> 1282769941 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282769941 -0700

am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check

Merge commit '1ef41605bbde97fb3979003a652fd365a0d034aa'

* commit '1ef41605bbde97fb3979003a652fd365a0d034aa':
  DO NOT MERGE fix null check