tree b0a8e917bfc061aca8969c8ffb64ab6b027a19db
parent b9b752aac7dff35144f202e864deb9b79d1863be
parent 20fb8187c41cf0fd926620b9734b9211ce0c8306
author Chris Tate <ctate@android.com> 1430531858 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430531858 +0000

am 20fb8187: am a51f14d0: Merge "Fix NPE in JobServiceContext when closing job."

* commit '20fb8187c41cf0fd926620b9734b9211ce0c8306':
  Fix NPE in JobServiceContext when closing job.