| commit | a677ea72b159317ebb7456f60703babacef61650 | [log] [tgz] |
|---|---|---|
| author | Sharvil Nanavati <sharvil@google.com> | Fri Mar 25 20:14:28 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 25 20:14:31 2016 +0000 |
| tree | ef8afdb67622421b01c1b10049007621a9164b69 | |
| parent | 9f68357d5f71c263f2ff67736a0d2272cc840c32 [diff] | |
| parent | cd8bb276f2e1975b71a9bef8c4f89d918fd5e296 [diff] |
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev