tree 252c46597f51b2cae3b9e02e40cf8fee0723f2a6
parent 7ea07312f5cec98cf39b676afbc7589f17e94e21
parent 3f4510535397bf103d0299440a0299ff8bbeec28
author Paul Jensen <pauljensen@google.com> 1461246893 +0000
committer android-build-merger <android-build-merger@google.com> 1461246893 +0000

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am: 3f45105353

* commit '3f4510535397bf103d0299440a0299ff8bbeec28':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: Ic664fa080316eff75dd22fc8e84431cb0eb903be