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:
56ae62a
280a223
)
Merge "Move NattKeepalivePacketData out of the framework" am: 833edcbb1b am: cab3f447ae
author
Aaron Huang
<huangaaron@google.com>
Wed, 24 Apr 2019 05:48:59 +0000
(22:48 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 24 Apr 2019 05:48:59 +0000
(22:48 -0700)
am:
280a223c28
Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6
Trivial merge