tree 372aa2b4d785acc4d7e54488d648037f98491fa9
parent 83b96e02a4bc8b0e9f5308b441609411ee347baf
parent 9aeb080eec2286e8604901bd2b8248be4e527107
author Dmitriy Ivanov <dimitry@google.com> 1426283447 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426283447 +0000

am 9aeb080e: Merge "Switch libjnigraphics to sysv-only hash style"

* commit '9aeb080eec2286e8604901bd2b8248be4e527107':
  Switch libjnigraphics to sysv-only hash style