tree cb52abd4d8d2899e9f9815e6022cd437bc8e0049
parent 66ea3e6c08d40ba656d06996d946502f94008312
parent 589d6f45d4c38c1d74ea970284c32ed013422eef
author Elliott Hughes <enh@google.com> 1364577570 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364577570 -0700

am 589d6f45: Merge "Use longs instead of ints to store pointers in NIO buffers."

* commit '589d6f45d4c38c1d74ea970284c32ed013422eef':
  Use longs instead of ints to store pointers in NIO buffers.