tree 3fd6f09af10c7aa9fe3abcd2bd6ea0a886c4ee8d
parent 486fdeca120cbb4209159af46d92842e9779f9d4
parent 40bd4ef6c35b7a47353de6071b02e51bf04ce0f0
author Jeff Sharkey <jsharkey@android.com> 1437179020 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437179020 +0000

am 40bd4ef6: am 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev

* commit '40bd4ef6c35b7a47353de6071b02e51bf04ce0f0':
  Clear identity when killing media provider.