OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e70aea
2b689e6
)
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
author
Roshan Pius
<rpius@google.com>
Tue, 25 Jul 2017 20:56:33 +0000
(20:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Jul 2017 20:56:33 +0000
(20:56 +0000)
am:
2b689e63ca
-s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
Trivial merge