tree 938a6dd806ac939bd509c3bc130a58b1b0a4b196
parent 88674941e1cb506554e23d7f44170c5829094615
parent d737f715d1188abf89891f4c38308fee04ae2e73
author Paul Jensen <pauljensen@google.com> 1443030173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443030173 +0000

am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

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