| commit | cbe62347dbd12e7a5a2d7d4a3e755654f5b365d4 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 23:49:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 23:49:15 2015 +0000 |
| tree | a9b13592e7c305d4adb15913596aeb3dc23f793d | |
| parent | e01a75253e309ae7607d0b38a0519d3df6cc448a [diff] | |
| parent | 60a3bf5829e15a7ec4386f916f2b454117adc775 [diff] |
am f11920b6: am f7a8b2d6: am 8398386a: Merge "Revert "Split adb_main.cpp into client and daemon."" * commit 'f11920b6f1c3dfaaa7aa55e80bb61f23279522a4': Revert "Split adb_main.cpp into client and daemon."