OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3e3de5d
861d45b
)
Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev am: 3f45105353
author
Paul Jensen
<pauljensen@google.com>
Thu, 21 Apr 2016 13:59:20 +0000
(13:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Apr 2016 13:59:20 +0000
(13:59 +0000)
am:
861d45b5e1
* commit '
861d45b5e14e6102f909ebd9479d8c7192d00740
':
Change-Id: I8cf403ba6b276e3f205c0989d3f1ae6e2f462bd9
Trivial merge