commit | ba374a8793d48c3f75873e8168fd48116c33ceab | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Mon Jun 01 15:43:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:43:31 2015 +0000 |
tree | b11de96f03aeae97ac4fd188f25a2c08c0fe85bc | |
parent | a9ae06f0922a11340d606fcfb66a1853a2ae7733 [diff] | |
parent | d4618a59815dbd6c39fedd9a0f0774a0fb6248d1 [diff] |
am d4618a59: (-s ours) am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key * commit 'd4618a59815dbd6c39fedd9a0f0774a0fb6248d1': DO NOT MERGE Securely encrypt the master key