tree e538d0d7ba05c9f82b65447e1652c3b8ace7d0f5
parent c4426215e9fd7821cd1f2aa95cce5de5fb3dda06
parent b95f71612d7dfc1dfcb825cb1d96ccdb95e14c0f
author Kenny Root <kroot@google.com> 1362783267 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362783267 -0800

am b95f7161: Merge "NativeCrypto: various fixes"

* commit 'b95f71612d7dfc1dfcb825cb1d96ccdb95e14c0f':
  NativeCrypto: various fixes