tree 6821127d5e36de744a93aa91464d339bf7ffd93f
parent f20ba4b797b0b11208aa72d822c17d7ab972a32e
parent 905829393d85db3e5d3f4b18a37c5da7184e6a63
author Robin Lee <rgl@google.com> 1447423892 +0000
committer android-build-merger <android-build-merger@google.com> 1447423892 +0000

Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b
am: 905829393d

* commit '905829393d85db3e5d3f4b18a37c5da7184e6a63':
  VPN settings: grey out policy-restricted menus