| commit | 830cfcc53318c15675a4e35c603556279f4b58f4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:42:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:42:04 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 29face8741909f45c2989e430b85d3ccc169e179 [diff] | |
| parent | 2336f434f84b33fc1bf10e4f0fbfb29631107648 [diff] |
am fee06481: (-s ours) am d66e949b: am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument." * commit 'fee06481213be7c2c5ba772bc45e56baa7802a95':