| commit | 30f887a96ae9c1259b3cb1a3b9293820a212d4ef | [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 | 7fce82bd546a316cb2db56f3234d4b5f158e0484 | |
| parent | 8411eed10dfa75d10995035e77439263b4daeddc [diff] | |
| parent | d57ae212df694ea2b1b9303641945f5f20ee9589 [diff] |
am 775eeca0: am 44bc7921: am d57ae212: am 8a37e0b3: am 48c2210b: am 4a4d6864: 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