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:
62dce20
43b1d48
)
Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev am...
author
Peter Qiu
<zqiu@google.com>
Wed, 14 Jun 2017 19:28:40 +0000
(19:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 14 Jun 2017 19:28:40 +0000
(19:28 +0000)
am:
43b1d48a10
-s ours
Change-Id: Ie42b1f88ae5aaef270b6af3b0307fa1ec5345473
Trivial merge