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:
f8ba376
4f48862
)
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
author
Hugo Benichi
<hugobenichi@google.com>
Tue, 1 Aug 2017 05:27:59 +0000
(
05:27
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 1 Aug 2017 05:27:59 +0000
(
05:27
+0000)
am:
4f48862d0f
-s ours
Change-Id: I66aa7d2d7128272bedc04568dbdcb759a3be8afe
Trivial merge