tree 35edfb25aa51ab010cd62fdb08cca685c69fc9a4
parent 7e0598d066e58ad9cadbd2c654a42563e56adbab
parent 664c48e991a70d07646d54125e97f579f3a33be4
author Elliott Hughes <enh@google.com> 1283967521 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283967521 -0700

am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread

Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.