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:
d6fb308
7577a2f
)
Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744...
author
nharold
<nharold@google.com>
Sat, 3 Jun 2017 00:15:53 +0000
(
00:15
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 3 Jun 2017 00:15:53 +0000
(
00:15
+0000)
am:
7577a2ff56
Change-Id: Iafed2773a6d32542b051d944341533b2190aa284
Trivial merge