OSDN Git Service

am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:28:39 +0000 (15:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:28:39 +0000 (15:28 +0000)
commitd4618a59815dbd6c39fedd9a0f0774a0fb6248d1
treeb11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parenta9ae06f0922a11340d606fcfb66a1853a2ae7733
parent731a7a242df6cc3441ac82b4f9521546fac5ac2d
am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key

* commit '731a7a242df6cc3441ac82b4f9521546fac5ac2d':
  DO NOT MERGE Securely encrypt the master key