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:
443afa5
8a82e7d
)
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev am: 35eb324bf1
author
Nathan Harold
<nharold@google.com>
Wed, 26 Apr 2017 18:17:40 +0000
(18:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 26 Apr 2017 18:17:40 +0000
(18:17 +0000)
am:
8a82e7d548
Change-Id: Idf7ca8bc14ba2502ed35fbaa452f7eb49a66be78
Trivial merge