| commit | 871c7c9f513e517435547b30b9e5df2e99a5b980 | [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 | 3e7adb8bac394a66bbd8a7ce0f25ff1b3004d0c1 [diff] | |
| parent | 325f063e6f25be68b671a3ba51cd2127683b9f65 [diff] |
am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument." * commit '2e7c39ecf7489540ad23e52cbe8bce94b0e26eca': "adb tcpip" should require a numeric argument.