OSDN Git Service

am 6555a64f: am 4d572b01: Merge "Load crypto plugins from additional shared libraries...
authorJeff Tinker <jtinker@google.com>
Mon, 25 Mar 2013 20:27:38 +0000 (20:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Mar 2013 20:27:38 +0000 (20:27 +0000)
* commit '6555a64fb9c761113eb17a8f19312a6bd5846fa3':
  Load crypto plugins from additional shared libraries


Trivial merge