| commit | d66e949b14305b367d3de4ba00901bff1122bb0e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 21 23:37:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 23:37:57 2015 +0000 |
| tree | 90d3765f5af1e4b894d4f7254b6901d29e0bc1e6 | |
| parent | 59ae39473d1d9a53ecfbeb802f2b91c8e00a33e6 [diff] | |
| parent | 2e7c39ecf7489540ad23e52cbe8bce94b0e26eca [diff] |
am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument." * commit '2e7c39ecf7489540ad23e52cbe8bce94b0e26eca': "adb tcpip" should require a numeric argument.