Paul Jensen 9f1af846ba am 41027a92: resolved conflicts for merge of 32380993 to mnc-dr-dev ...

* commit '41027a921c413cc02fe2568b098bedfbee6ca42b':
  Fix NOT_RESTRICTED network capability and enforce it.

2015-08-05 11:24:35 +00:00

..

core/java/com/android/server

am 41027a92: resolved conflicts for merge of 32380993 to mnc-dr-dev

2015-08-05 11:24:35 +00:00

tests/servicestests

Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

2015-08-05 10:03:47 +00:00