tree 8ba6687b9bb2b953f68dbfbfdb2168088b2a13a0
parent 63082eab1f1e18b06882fbbaf08ee64c3f68193a
parent 69b20474d578ea6313570c29526fc0854a920946
author Nick Kralevich <nnk@google.com> 1429318117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429318117 +0000

am 69b20474: Merge "Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs"

* commit '69b20474d578ea6313570c29526fc0854a920946':
  Support LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES for prebuilt APKs