tree 226d801c310ed3f30e03bb2617cf5fe2d6ac68da
parent 3559d1d1fc9d6e57325f50cde36c433044793b11
parent fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f
author Kenny Root <kroot@google.com> 1283491959 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283491959 -0700

am fb79b7da: am 12da9d74: Fix buffer compacting in NativeDaemonConnector

Merge commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f'

* commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f':
  Fix buffer compacting in NativeDaemonConnector