| commit | cf24be99bb98ada2ba44722fd39f19511f4feffb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Jan 14 02:57:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 14 02:57:53 2017 +0000 |
| tree | 72f22d06dd292d1c41a5e15a46548f58b8743b0c | |
| parent | b21ae4f2d1c9e94ea71846b3d724a6925f7108bc [diff] | |
| parent | 5bdade8a93a31b72fb3173d58ca1aab7993803bd [diff] |
Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93 Change-Id: I0ca6a8824a2f89867e85fea6ee8d97f6dd3a1acf