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

Browse Source

am: 1c7f5bb  -s ours

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

...

This commit is contained in:

Sharvil Nanavati

2016-03-25 20:20:41 +00:00

committed by android-build-merger

parent e7f365734c 70ee7efa31

commit 70afb70e73

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available