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