| commit | 5e65ffb5f6d747146ba09c86ae9ba161acfb7f8c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Mar 28 08:46:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 28 08:46:15 2013 -0700 |
| tree | 740b5b007bb81c5cba6d7788182a0028f4d0ce68 | |
| parent | f7a6321a87d4dc1139ed22fa2df415097e73a2d1 [diff] | |
| parent | 6cf77a7e2b8ccacfee646f1a8abbb2e19a962081 [diff] |
am 6cf77a7e: am 303d1c92: Merge "Simplify the nio Buffer implementations, and fix MappedByteBuffer." * commit '6cf77a7e2b8ccacfee646f1a8abbb2e19a962081': Simplify the nio Buffer implementations, and fix MappedByteBuffer.