tree c7af2f95bd9be5c567a2cd6cd20bd30bdb721991
parent 06cb6f5252fb045688ee1d20b968bfa5fc1e4a67
parent 0c0af4b0cc6f945748afb2e009badb2725c5a1de
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1548800064 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1548800064 +0000

Merge "Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp am: 299f825678"