OSDN Git Service

am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge...
authorPaul Jensen <pauljensen@google.com>
Wed, 23 Sep 2015 14:50:45 +0000 (14:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 14:50:45 +0000 (14:50 +0000)
commit4b7b81178482029f7f58d64cea8620574294ce78
treeeae61e2e254c64fcf48cba70f5330098cf1a8ecf
parent83ce299c6a676819351985c379661ae1f98e806c
parent9971167fbe7f3b356ba7fd89d91271376a56d235
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 '9971167fbe7f3b356ba7fd89d91271376a56d235':
  Don't mark NetworkRequests restricted when they don't have restricted caps