OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager...
authorSharvil Nanavati <sharvil@google.com>
Fri, 25 Mar 2016 20:18:05 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Mar 2016 20:18:05 +0000 (20:18 +0000)
commit1c7f5bb49c1918be446b967fd78b02313429322f
tree504007cc53789a8ad63a0b7fd292fb237f204cc1
parent0c7535bb4fbf2306df7039a3358c1216de34cd8f
parenta677ea72b159317ebb7456f60703babacef61650
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.