| commit | 1b302781d3c9e1be01997ef01d475a5f9e1a512c | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 24 05:46:47 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 24 05:46:47 2016 +0000 |
| tree | 36ee0c4119f5e91a920b0d94ad3d84b333e202dd | |
| parent | 89b2f762ff28047bcde1cbf9ca1c18f366f58d12 [diff] | |
| parent | 4b31fe9f847b4a40ba5890f07277b9ca872392e5 [diff] |
Merge "Merge "Add a test for closing sockets when a VPN comes up." into nyc-dev am: 94636121f1 am: 45af342981" into nyc-mr1-dev-plus-aosp