tree 7a7bf707574f5a32f84d064613d3b407e0d6609b
parent d884b41331fa486d5e4b02df725e37a497b08cc9
parent 8ae629f6cbda2ad55a1b6f3f508a04dc348ed796
author Paul Crowley <paulcrowley@google.com> 1436875255 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436875255 +0000

am 8ae629f6: am 63690fa5: am 140ff7a5: am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev

* commit '8ae629f6cbda2ad55a1b6f3f508a04dc348ed796':
  Delete the user key when deleting a user.