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:
6cc4c0c
ac02bc8
)
Merge "Fix flaky testNattSocketKeepalives"
author
Remi NGUYEN VAN
<reminv@google.com>
Thu, 14 Feb 2019 03:29:00 +0000
(
03:29
+0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Thu, 14 Feb 2019 03:29:00 +0000
(
03:29
+0000)
1
2
tests/net/java/com/android/server/ConnectivityServiceTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/net/java/com/android/server/ConnectivityServiceTest.java
Simple merge