tree c26c49d8606c75257c37b3ec5be416416fcab614
parent c9f714b65cdb05cef4797f30a42d006b80140aaf
parent 6996a1fc34e0e5531f2368612805665cde628f27
author Ying Wang <wangying@google.com> 1398087413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398087413 +0000

am 6996a1fc: am 6ad0c4ff: Merge "Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build."

* commit '6996a1fc34e0e5531f2368612805665cde628f27':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.