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:
995bf1e
cab3f44
)
Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b
author
Aaron Huang
<huangaaron@google.com>
Wed, 24 Apr 2019 04:26:03 +0000
(21:26 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 24 Apr 2019 04:26:03 +0000
(21:26 -0700)
am:
cab3f447ae
Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
1
2
services/net/java/android/net/NattKeepalivePacketData.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/net/java/android/net/NattKeepalivePacketData.java
Simple merge
OSDN Git Service
