tree 79de8bb02259d83a7330351743d677028fa9adfe
parent 88a8766a3a3edbe33e190542092b6519e1540af3
parent 13c5c066f4b4f2b4cd2afa2b73ea828099761844
author Kenny Root <kroot@google.com> 1380682726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380682726 -0700

am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib"

* commit '13c5c066f4b4f2b4cd2afa2b73ea828099761844':
  Conscrypt: add missing libraries to JNI lib