OSDN Git Service

am d4618a59: (-s ours) am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the maste...
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:43:31 +0000 (15:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:43:31 +0000 (15:43 +0000)
commitba374a8793d48c3f75873e8168fd48116c33ceab
treeb11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parenta9ae06f0922a11340d606fcfb66a1853a2ae7733
parentd4618a59815dbd6c39fedd9a0f0774a0fb6248d1
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