tree 0e53cfc26ae303d669b498e64fe63da63ee80f11
parent 4e852f47580a1ec877a1cd9521b4d5a895b57131
parent 303d1c92020f2f8ba663af19d4bd0cf2f445fd33
author Elliott Hughes <enh@google.com> 1364485477 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364485477 -0700

am 303d1c92: Merge "Simplify the nio Buffer implementations, and fix MappedByteBuffer."

* commit '303d1c92020f2f8ba663af19d4bd0cf2f445fd33':
  Simplify the nio Buffer implementations, and fix MappedByteBuffer.