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:
435fa8b
1efa51a
)
Merge "Add permission check to setAllowOnlyVpnForUids" am: 1fb2ed3de3
author
Rubin Xu
<rubinxu@google.com>
Fri, 25 May 2018 09:56:21 +0000
(
02:56
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 25 May 2018 09:56:21 +0000
(
02:56
-0700)
am:
1efa51a873
Change-Id: I43efafcb80a85f0cb94037440e66a2568b71af63
Trivial merge