tree aad4c3972e6ff7828a2f9a6f54ae9b5b2152ca79
parent c5da3fe1de36c231b8b1ac2aa07c2bf880af7b91
author Paul Crowley <paulcrowley@google.com> 1436884949 +0100
committer Paul Crowley <paulcrowley@google.com> 1436884949 +0100

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

This reverts commit c5da3fe1de36c231b8b1ac2aa07c2bf880af7b91, reversing
changes made to d884b41331fa486d5e4b02df725e37a497b08cc9.