tree bd9ba6ce965691fb2b4b711f821d516a5ac16326
parent ed755abbb0205cd441068943359fd17fe528d409
parent 1c8b3778e1c380992a9ca96e965cdc4e6f3bca66
author Dmitriy Ivanov <dimitry@google.com> 1426283965 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426283965 +0000

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

* commit '1c8b3778e1c380992a9ca96e965cdc4e6f3bca66':
  Switch libjnigraphics to sysv-only hash style