Skip to content
Commit 00ef0419 authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

[automerger skipped] Merge "Whitelist packages from VPN lockdown." am: efc77352 am: 295016b2 

am: 52e0e403 -s ours
am skip reason: change_id I7f6c5b9172063b588feacd6b9930a6cb88f764ab with SHA1 1d58621a is in history

Change-Id: I56f2eadd2e95a74897d7e17cb21d672e747b8261
parents 658db85c 52e0e403
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment