tree 034afcc58a2cdd74d75970164a7a75cbeb0ce38f
parent 1dae686531927208eca3dc4f99e117ff28aeba97
parent d22d8e03f6bec40d22d1baad36884bd6dd11dc5e
author Leon Scroggins III <scroggo@google.com> 1424450939 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424450939 +0000

am d22d8e03: am 19332727: am 31b3a825: am 0e1c7ef1: Fix bugs in jmem-ashmem.

* commit 'd22d8e03f6bec40d22d1baad36884bd6dd11dc5e':
  Fix bugs in jmem-ashmem.