tree 9f88fc88356a7a9cbd4ff30de62fc600b81e310a
parent 359f59445d872086ca0c01919d8112c47e2af8fa
parent 0257c82fa122243e97e4a1f4ef4bc4b8c21bd692
author Lorenzo Colitti <lorenzo@google.com> 1440018093 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440018093 +0000

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

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