tree 3029e11aadbe4fdded5b24b8c0fe938a69909184
parent 86111508c9adddf8f26c4d1b05ba28d21c0033c2
parent b8997ce7ac3c917edf71a2880b68541678c5fec3
author Andre Eisenbach <eisenbach@google.com> 1418759808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418759808 +0000

am b8997ce7: am 561f8821: Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev

* commit 'b8997ce7ac3c917edf71a2880b68541678c5fec3':
  Prevent possible NullPointerException when service is destroyed