| commit | 775eeca0205b87008bd21b1dd95be228870f5aee | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 23:59:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 23:59:56 2015 +0000 |
| tree | 2a8ecc8a8d5bb483978ad78e5b3e88b16f43cb67 | |
| parent | 944e7ae0ec219a3547206a1b5556d80d0d4719ae [diff] | |
| parent | 44bc7921970243252a346fba768cbd586a2329b0 [diff] |
am 44bc7921: am 26bbbb37: am 4cedf16a: am 48c2210b: am dab66aa3: Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev * commit '44bc7921970243252a346fba768cbd586a2329b0': Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class