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:
0b427fd
c97f2a7
)
Merge "VpnDialogs should be able to control always-on VPN." am: d5d7492040 am: 09aa059ec4
author
Pavel Grafov
<pgrafov@google.com>
Wed, 30 Jan 2019 20:28:07 +0000
(12:28 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 30 Jan 2019 20:28:07 +0000
(12:28 -0800)
am:
c97f2a7c71
Change-Id: Ib0d3fea2da62271ff7e9fc92738ae4b0a1270182
Trivial merge