| commit | f8a220b1a19434927c81b00e6c422974f9931925 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 08 22:10:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 22:10:45 2015 +0000 |
| tree | dd214fc79f1e798a288278c8f7111565e9d7f8a5 | |
| parent | 8a5ac64f4bb66b6c12d5ea7f234978e7865f22f9 [diff] | |
| parent | 775eeca0205b87008bd21b1dd95be228870f5aee [diff] |
am 775eeca0: 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 '775eeca0205b87008bd21b1dd95be228870f5aee': Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class