OSDN Git Service

Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 3f45105353
authorPaul Jensen <pauljensen@google.com>
Thu, 21 Apr 2016 13:57:12 +0000 (13:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 13:57:12 +0000 (13:57 +0000)
am: eedfc5457f

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

Change-Id: I44df1d666f710f938951820227090c4dbbbb7293


Trivial merge