tree 4a530b2684809908cd82d5160a4f13e0866b23f6
parent cb2a94ac7679971f80871895d5af96e6aef25aa0
parent eb0c05ced4264f095b309b17f56babf49b3696dd
author Paul Crowley <paulcrowley@google.com> 1431530503 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431530503 +0000

am eb0c05ce: Merge "Break key installation into its own function so we can install non-master keys."

* commit 'eb0c05ced4264f095b309b17f56babf49b3696dd':
  Break key installation into its own function so we can install non-master keys.