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:
6bc2199
f2383db
)
Merge "Fix race condition in NsdManagerTest"
author
Hugo Benichi
<hugobenichi@google.com>
Wed, 31 May 2017 13:08:37 +0000
(13:08 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 31 May 2017 13:08:37 +0000
(13:08 +0000)
am:
f2383db747
Change-Id: Ifd731767608e738a271bd5793a462675c2a93123
Trivial merge