Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: d73c6eb6f3" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
9c13d78862