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:
f4c8a84
f9422cc
)
Merge "Fix NPE in NsdServiceTest" am: 60d5390f7a
author
Hugo Benichi
<hugobenichi@google.com>
Thu, 28 Sep 2017 12:28:44 +0000
(12:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 28 Sep 2017 12:28:44 +0000
(12:28 +0000)
am:
f9422cc65b
Change-Id: I2c88d81081c7994d42eb2715f29233817730201d
Trivial merge