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:
2cad9a8
f95a370
)
Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6
author
Etan Cohen
<etancohen@google.com>
Mon, 26 Sep 2016 16:53:04 +0000
(16:53 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 26 Sep 2016 16:53:04 +0000
(16:53 +0000)
am:
f95a3703c1
Change-Id: Ic271ac809add1ac66b468ee337f2838e2a008cdc
Trivial merge