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