| commit | f7a8b2d68b57d64eb89b557b4dfc9ad619a04f98 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 23:24:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 23:24:57 2015 +0000 |
| tree | 2c53ee1b0f321a632ca87412a550b451938980f7 | |
| parent | 5f8ad2c7ad057793cdb446c733ebee5c920c6bb3 [diff] | |
| parent | 8398386a6381d6d1d597cd5c5cecf9a2b11ea104 [diff] |
am 8398386a: Merge "Revert "Split adb_main.cpp into client and daemon."" * commit '8398386a6381d6d1d597cd5c5cecf9a2b11ea104': Revert "Split adb_main.cpp into client and daemon."