am e2c0c9de: (-s ours) DO NOT MERGE Securely encrypt the master key

* commit 'e2c0c9de7b99ed5cd2349e0585284fd6a0ad768a':
  DO NOT MERGE Securely encrypt the master key
This commit is contained in:
Paul Lawrence 2015-06-01 14:30:25 +00:00 committed by Android Git Automerger
commit 721a3218a6

Diff content is not available