| commit | dab66aa3ee12472d827595cf396b9f1a1feb5211 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 23:00:48 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jun 05 23:00:48 2015 +0000 |
| tree | 616db31230569e3ae49b7bc40f6d9f815cdd0912 | |
| parent | 98d98f73c8eef522419ab17185e30e80a8a8c3f6 [diff] | |
| parent | 4a305d55754cfbc864b165527bfe24ce6218d946 [diff] |
Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev