tree cb3de54efbde9516e34f8e3224ad70e388be21e0
parent 0c6b23ae95bb9490df2995d3f4a29636eaa5cc7e
parent 6743c1712e1051ae99639a7d90912c54a0be8b24
author Jeff Sharkey <jsharkey@android.com> 1381425689 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381425689 -0700

am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev

* commit '6743c1712e1051ae99639a7d90912c54a0be8b24':
  Guard against NPE when using existing process.