tree 98629866349554d3ba379c00f08335e2a91e33f7
parent 8b0b56df19103ecb42e69a8d6035e96f51864d8e
parent a5bfd73ab683d3310ee3ce31d7ad3edb656aa858
author Lorenzo Colitti <lorenzo@google.com> 1440019383 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440019383 +0000

am a5bfd73a: am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev

* commit 'a5bfd73ab683d3310ee3ce31d7ad3edb656aa858':
  Don't mark NetworkRequests restricted when they don't have restricted caps