tree 635d2928787529e9127c773025d544820da3a374
parent df50c12af58e5fd2a201ce7f874eb0648c6dc002
parent ab5e962e1dd05799980342757edd8e83f4a76a8e
author Lorenzo Colitti <lorenzo@google.com> 1440018922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440018922 +0000

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 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps