tree 504007cc53789a8ad63a0b7fd292fb237f204cc1
parent 0c7535bb4fbf2306df7039a3358c1216de34cd8f
parent a677ea72b159317ebb7456f60703babacef61650
author Sharvil Nanavati <sharvil@google.com> 1458937085 +0000
committer android-build-merger <android-build-merger@google.com> 1458937085 +0000

Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev
am: a677ea7  -s ours

* commit 'a677ea72b159317ebb7456f60703babacef61650':
  DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.