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