tree ad00e722405b9d2be48afa16fedd0f04433c9bee
parent 21b97ed5693d039e8b9dea57a160d3307f412682
parent ecc76ba5516d62a886f9c290906e0ca50702c9ab
author Kenny Root <kroot@google.com> 1277753056 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277753056 -0700

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

Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into gingerbread

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