tree e87584f7a28010b1a1e0cc5930bd5959a5239c7c
parent 3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3
parent 10a7d7449dae2aabf4f22f980e7efabf274a939a
author Paul Jensen <pauljensen@google.com> 1443007993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443007993 +0000

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.