tree 62d7ea006812aeb5dad940033b3c2a7c637a74cc
parent 2b377522da2264879305a2073d2eef0a7f908873
parent 900fecc9d66bda71f428a4d3cebc1fee14916301
author Jeff Tinker <jtinker@google.com> 1364242777 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1364242777 +0000

am 351f28e2: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev

* commit '351f28e2e71bef7fab42ec36150b7973fd4ef139':
  Load crypto plugins from additional shared libraries