tree d662169d70288e80787f56250842bb01532885a2
parent eed5e7d102f897aaf8e98de2242f9aef2f7792c0
parent 6b1f582457c907acb154f5f326aa6c7a602105c4
author Martin Hibdon <mhibdon@google.com> 1414955005 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414955005 +0000

am 6b1f5824: am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed

* commit '6b1f582457c907acb154f5f326aa6c7a602105c4':
  Allow an external security provider to be installed