commit | 4f53f877d3cb0f9eec8f690ec7b899c51bea312c | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Thu Aug 27 12:17:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:14 2015 +0000 |
tree | 05cbf3106bfecaa475bd48ba1fd0bedf3743bc09 | |
parent | 2653b711cadda592ead6c40bf4041cad6a755c07 [diff] | |
parent | 027034b790296f242edd1b99ed12fbcd7ef02593 [diff] |
am 027034b7: (-s ours) am 12248fd3: Merge "Implement delete_key and delete_all_keys in SoftKeymasterDevice." into mnc-dev * commit '027034b790296f242edd1b99ed12fbcd7ef02593':