OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb7a0d8 ee75357)
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb5...
authorRobin Lee <rgl@google.com>
Wed, 4 May 2016 22:22:32 +0000 (22:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 22:22:32 +0000 (22:22 +0000)
am: ee75357488

* commit 'ee753574885ec59b0948e1c85039e77fb4953eea':

Change-Id: I08db3c8957676a4a2c2cb924e6259629f00cda2d


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help