OSDN Git Service

Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b am: 905829393d
authorRobin Lee <rgl@google.com>
Fri, 13 Nov 2015 14:14:09 +0000 (14:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Nov 2015 14:14:09 +0000 (14:14 +0000)
commit8edd4c1f8d44cda66c1822fcbdc8e23702daff1b
tree3971e1f7ad38b7ba8fbe10cbe046cba5acf8821c
parent3bc72ec0e099a8e494ea75052d34d2f30787c508
parent3ed65b90d0348b60fc57c08e96986e03fef2fd4e
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b am: 905829393d
am: 3ed65b90d0

* commit '3ed65b90d0348b60fc57c08e96986e03fef2fd4e':
  VPN settings: grey out policy-restricted menus
src/com/android/settings/vpn2/VpnSettings.java