tree 28bcbf5a6001111e000f9234546c42ee3d44f201
parent 97ca48e7f4ac8d3842f74f92b8f40d0e74733f38
parent ecc76ba5516d62a886f9c290906e0ca50702c9ab
author Kenny Root <kroot@google.com> 1277753086 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277753086 -0700

am ecc76ba5: Set adbd to be disabled by default in recovery

Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into froyo-plus-aosp

* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
  Set adbd to be disabled by default in recovery