tree 42b1a919e842989682d8a13bbb6e43ec5c444f11
parent 06a86644cca0621696afc38db02f2fe2010f120c
parent 11e84bde9e98cb4b777a67208989d259883e9375
author Lorenzo Colitti <lorenzo@google.com> 1440017688 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440017688 +0000

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

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