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:
d60707b
833edcb
)
Merge "Move NattKeepalivePacketData out of the framework"
author
Aaron Huang
<huangaaron@google.com>
Wed, 24 Apr 2019 04:17:26 +0000
(21:17 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 24 Apr 2019 04:17:26 +0000
(21:17 -0700)
am:
833edcbb1b
Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
Trivial merge