tree 69694f07802f5723cde9be049e46d48ec38a6fb8
parent 9e6513f1450eb060862eb3bd7111176abee4ca6c
parent c78a9698dd55a165c2206c380f87f173bacba2aa
author Kenny Root <kroot@google.com> 1277753325 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277753325 -0700

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

Merge commit 'c78a9698dd55a165c2206c380f87f173bacba2aa'

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