tree a4ba9addadaf449ba6891cf3225b5fdcf8a603b6
parent 36e3fb8dafd0523538f14ced00d7c97a05398841
parent 6ad0c4ffc3d50a6829a984c2ac37525680fc61eb
author Ying Wang <wangying@google.com> 1397865911 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397865911 +0000

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

* commit '6ad0c4ffc3d50a6829a984c2ac37525680fc61eb':
  Now LOCAL_JNI_SHARED_LIBRARIES works for both bundled and unbundled build.