| commit | 32dd84843615de6226ebcff81720599548203b60 | [log] [tgz] |
|---|---|---|
| author | Sharvil Nanavati <sharvil@google.com> | Thu Mar 24 20:17:43 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 24 20:17:45 2016 +0000 |
| tree | 5c1caa8093b86813123094251b46973bd3a64f88 | |
| parent | e60d72f49a10ba8d51fd184ed5604ca4d8225552 [diff] | |
| parent | 7f8d650ed75ce6f3934c62f971683fa806201e51 [diff] |
Merge "Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into nyc-dev