tree a0c41b4dde16fb6a129caf1729a7478c9c630b62
parent 0ddf436ef9450b7ecd4bce1206758f8d75267bfa
parent 02ac0bfdc1c80a2f18487d28aa56dcd8499de246
author Colin Cross <ccross@android.com> 1386199090 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386199090 -0800

am 02ac0bfd: Merge changes I28ce0288,I86482e16,Ib957fae8,I1a27459b,I3e9c53c3,I91082f58,I395e5361,I6a01ff6f,I0ca31094,I56408690,Ieabdcb1c,Ib9b21771,I10927f48,I49ba2ba2

* commit '02ac0bfdc1c80a2f18487d28aa56dcd8499de246':
  Fix fastbootd's <linux/kexec.h> reference.
  Fastbootd: Comments and general cleaning
  Fastbootd: General fixes and changes
  Revert "Revert "Fastbootd: flashing certification""
  Fastbootd: auto ssh server start
  Fastbootd: network auto discovery
  Fastbootd: socket and network transport
  Fastbootd: build breakage fix
  Revert "Fastbootd: flashing certification"
  Fastbootd: flashing certification
  Fastbootd: improved operations on gpt
  Remove a homebrew mmap64.
  Fastbootd: fixed missing file in Android.mk
  fastbootd: erase, boot and partitioning commands