| commit | 2765dfc8a255cd601ef6e07e0c347db2a5ae4c5d | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Mon Jun 27 12:19:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 27 12:19:17 2016 +0000 |
| tree | a64b0cd5349333ac85ba82ec1d81f27b55dd4523 | |
| parent | cfdd4606a34e63420bd96a066614d9e8a950af75 [diff] | |
| parent | 441af44e4e9f7b6e55ab076a664a5772e61187ed [diff] |
Merge \"Reenable SocksProxyTest\" am: 441af44e4e Change-Id: I7e00756f1e83bbd5c4b9421eead370284885a257