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:
c507bca
5706a8f
)
Merge "[NAN] Rename to make discovery explicit"
author
Etan Cohen
<etancohen@google.com>
Tue, 20 Sep 2016 16:50:01 +0000
(16:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Sep 2016 16:50:01 +0000
(16:50 +0000)
am:
5706a8f535
Change-Id: Ic71e0eced353dfdfb989876ddb4c11f4188625c5
Trivial merge