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:
59d92fd
7417f60
)
Merge "[AWARE]: Document the default values in NAN enable/config" am: 1ea0399492
author
Etan Cohen
<etancohen@google.com>
Thu, 16 Feb 2017 21:10:32 +0000
(21:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 16 Feb 2017 21:10:32 +0000
(21:10 +0000)
am:
7417f60856
Change-Id: I5e6227b8f209199388ef8f5f0afebd7d62816786
Trivial merge