OSDN Git Service
(root)
/
android-x86
/
hardware-libhardware_legacy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa192e0
0f9dc48
)
Merge "[NAN] Security configuration (cipher)"
author
Etan Cohen
<etancohen@google.com>
Tue, 21 Feb 2017 17:56:44 +0000
(17:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 21 Feb 2017 17:56:44 +0000
(17:56 +0000)
am:
0f9dc48b2c
Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016
Trivial merge