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:
9953357
c530c01
)
Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d
author
nharold
<nharold@google.com>
Fri, 2 Jun 2017 23:57:05 +0000
(23:57 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 2 Jun 2017 23:57:05 +0000
(23:57 +0000)
am:
c530c01744
Change-Id: I529711b4a658cdf82e223194ebae4ecf1a7f3ce2
Trivial merge