tree 8b9d4c2f89899f02884465a8ce2bc16ce17ef801
parent 5682a23ed41f50057887870f1aa9848b13a26190
parent b0557acebc7a47f6d8a3653c376165160fc68105
author Dmitriy Ivanov <dimitry@google.com> 1429298422 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429298422 +0000

am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'b0557acebc7a47f6d8a3653c376165160fc68105':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS