tree e095ee9fe456d86a3b69aa07cc1607b5cb25cf67
parent a26c83718004c7640827d86b0f6a0fdf33017751
parent a04b43020e1289e8b7b2501471740ace944f18d5
author Dmitriy Ivanov <dimitry@google.com> 1429299056 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429299056 +0000

am a04b4302: am b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"

* commit 'a04b43020e1289e8b7b2501471740ace944f18d5':
  Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS