Merge "Disable restricted VPN actions onResume am: 52541536d0 am: 8a8f3f2f34" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-06-01 14:26:32 +00:00
committed by Android (Google) Code Review

Diff Content Not Available