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:
03b6176
294150a
)
Merge "Temporarily disable flaky test." am: 775d11c988 am: 6962eea7c7
author
lucaslin
<lucaslin@google.com>
Thu, 21 Mar 2019 15:39:31 +0000
(08:39 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Mar 2019 15:39:31 +0000
(08:39 -0700)
am:
294150afe2
Change-Id: I583ed9aa0e42e864ef0c1e74fbcd9357e093cc25
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