| commit | 4a4d686449ddb570b3b7a4cbca66de36880cd9f6 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 23:00:48 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jun 05 23:00:48 2015 +0000 |
| tree | d4a41a3e9333da6d088a4c0b211b907f219300be | |
| parent | e81d049a94f694adaab63fb5eedd4dc553508ee0 [diff] | |
| parent | fe5e165d399946ac7da71767abffa1b7e7456698 [diff] |
Merge "Fix testVpn timing issue for com.android.cts.net.HostsideNetworkTests class" into lollipop-mr1-cts-dev