Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: d73c6eb6f3" into nyc-mr1-dev-plus-aosp

Browse Source

am: 9c13d78862

* commit '9c13d78862ff07b2f7664d578c6fa5b28c2e6d58':

Change-Id: Ife7cda0e14804f8974a5142e423b7b85bade196e

...

This commit is contained in:

Tony Mak

2016-06-03 11:07:41 +00:00

committed by android-build-merger

parent 7cf85ffc58 9c13d78862

commit 4b63e1d9d3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available