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:
299eba7
66674ce
)
Merge "Fix testRegisterUsageCallback" am: d0b9f983d6
author
Remi NGUYEN VAN
<reminv@google.com>
Tue, 8 May 2018 09:13:00 +0000
(
02:13
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 8 May 2018 09:13:00 +0000
(
02:13
-0700)
am:
66674ce8fb
Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
1
2
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java
Simple merge