| commit | 60a3bf5829e15a7ec4386f916f2b454117adc775 | [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 | a9ad08e81f25f4bc9d6e96e56c562916e202d63e [diff] | |
| parent | abb33ae8276ea319b6c44593974a175f486fc490 [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."