OSDN Git Service

Merge "Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 14 Jul 2016 22:19:15 +0000 (22:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Jul 2016 22:19:17 +0000 (22:19 +0000)
commit8d3090466bebca995f6ae31cef80530e229c3b57
tree1e898a52e76cc791888d1cd1a5aeba21a2c44dde
parent0e06694e35d183da0a9e5d19c2aca87c03b26aeb
parent51afc1d9de2a3a9e7d89b44a7f4009b3c2126213
Merge "Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-dev am: 488042fe3b am: c4ef7669a1" into nyc-mr1-dev-plus-aosp