| commit | 2e5af5437d3b2c1d3d32c07c22b699883dbc9a7b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:08 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 5f548180aa701f77202a3592745e2fa85fb1a7d1 [diff] | |
| parent | 830cfcc53318c15675a4e35c603556279f4b58f4 [diff] |
am 2ae7d6c1: am fee06481: (-s ours) am d66e949b: am 2e7c39ec: Merge ""adb tcpip" should require a numeric argument." * commit '2ae7d6c16c65d17ea2563275b24d034d6616e5e5':