| commit | 8a37e0b3eb18598acef27dc774c2ab15bf881a74 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 23:23:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 23:23:04 2015 +0000 |
| tree | 3338dc342024194ff49fa639432596dedecf6aef | |
| parent | 5ebf501b41bb2392fa7881f882fab0fe1a0cf796 [diff] | |
| parent | 4a4d686449ddb570b3b7a4cbca66de36880cd9f6 [diff] |
am 48c2210b: am 4a4d6864: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev * commit '48c2210b5e45e3be88064a7f64b3d197b973d2a4': Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class