OSDN Git Service

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
authorPaul Jensen <pauljensen@google.com>
Thu, 21 Apr 2016 13:55:25 +0000 (13:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 13:55:25 +0000 (13:55 +0000)
commit861d45b5e14e6102f909ebd9479d8c7192d00740
treebfd721f6a8e6b64312c9b60202e7983fb41f99a3
parent50f963f022e2a847a6218f6ec182f9503854f551
parent3f4510535397bf103d0299440a0299ff8bbeec28
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: I194acabb1f9e301d88a40af8ea1d088a3d2ec0d9