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:
7520a07
2c02197
)
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
author
Hugo Benichi
<hugobenichi@google.com>
Wed, 11 Jan 2017 01:18:00 +0000
(
01:18
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Jan 2017 01:18:00 +0000
(
01:18
+0000)
am:
2c02197bdd
-s ours
Change-Id: I12ea7b87369c3228bb1fcc914cfdb316a3b501ce
Trivial merge