tree 3cfc49a2328057b877727897b9dfba2ab5ddec05
parent 535615cf4feda46725859ad1eeee5ea9382196fe
parent 58aa5b0ee0ec67d4e0f3b12e27cd58279bef0dee
author Mike Lockwood <lockwood@android.com> 1292010982 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1292010982 -0800

Merge "init: Allow non-root adbd to switch between TCP and USB modes"