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:
0490076
86150fa
)
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev...
author
Rubin Xu
<rubinxu@google.com>
Fri, 9 Mar 2018 17:54:44 +0000
(17:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 9 Mar 2018 17:54:44 +0000
(17:54 +0000)
am:
86150fa263
-s ours
Change-Id: I2e4ce57ba8d3dd8b2f0b8a903893b17e9d818999
Trivial merge