tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent 1875d0e25f2d2ccc13dae5d17feb070620f1dbd8
parent ae217a2bebf86f253e710444eaabf70816f5f1b6
author Elliott Hughes <enh@google.com> 1294711570 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294711570 -0800

am cbe26f42: am c8dde40c: Merge "Get memory for direct byte buffers from the Java heap rather than the native heap." into honeycomb

* commit 'cbe26f42f5b57db71402fbb1955898d3ab79e350':
  Get memory for direct byte buffers from the Java heap rather than the native heap.