OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b06946 e4dc066)
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into...
authorBernie Innocenti <codewiz@google.com>
Fri, 13 Jul 2018 17:49:00 +0000 (10:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 17:49:00 +0000 (10:49 -0700)
am: e4dc066e12  -s ours

Change-Id: Idd1f7eb3d18f9f8fd0601069ec583e64b52e1f10


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help