OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf0f217 d218123)
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
authorHugo Benichi <hugobenichi@google.com>
Sat, 22 Apr 2017 00:57:48 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:57:48 +0000 (00:57 +0000)
am: d2181235b9

Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help