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:
e71f1bc
974920a
)
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689...
author
Roshan Pius
<rpius@google.com>
Tue, 25 Jul 2017 21:06:25 +0000
(21:06 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Jul 2017 21:06:25 +0000
(21:06 +0000)
am:
974920af47
-s ours
Change-Id: Ib44b99d0d8804de60948929c4c6fc5e7d9c55cd5
Trivial merge