[automerger skipped] Merge "Whitelist packages from VPN lockdown." am: bec7854508 am: 4934a54f2e

am: bb4dff941d -s ours
am skip reason: change_id I7f6c5b9172063b588feacd6b9930a6cb88f764ab with SHA1 58e8be00ee is in history

Change-Id: I56f2eadd2e95a74897d7e17cb21d672e747b8261
This commit is contained in:
Pavel Grafov
2019-01-24 11:00:58 -08:00
committed by android-build-merger

Diff Content Not Available