| commit | 48c2210b5e45e3be88064a7f64b3d197b973d2a4 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 23:12:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 23:12:45 2015 +0000 |
| tree | c77fcaaceb85037cbb15a2293867e0880db16249 | |
| parent | 9372fd34bdc6b9a79f7b5356fef1de117a2f1b95 [diff] | |
| parent | dab66aa3ee12472d827595cf396b9f1a1feb5211 [diff] |
am dab66aa3: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev * commit 'dab66aa3ee12472d827595cf396b9f1a1feb5211': Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class