OSDN Git Service

am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network...
authorPaul Jensen <pauljensen@google.com>
Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 11:33:13 +0000 (11:33 +0000)
commit554cecea4c5e39c25efb721258366ce12e6b861c
treee87584f7a28010b1a1e0cc5930bd5959a5239c7c
parent3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3
parent10a7d7449dae2aabf4f22f980e7efabf274a939a
am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.
core/java/android/net/ConnectivityManager.java
core/java/android/os/INetworkManagementService.aidl
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/NetworkManagementService.java