commit | 2c56686d617be166c93950a20cff94eaed948575 | [log] [tgz] |
---|---|---|
author | Pavel Grafov <pgrafov@google.com> | Tue Jan 29 18:10:20 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 29 18:10:20 2019 -0800 |
tree | 731efce7afdeb13b95ac03914167817b51d1f59b | |
parent | 32088bd4e070ad24967a9127412b994aedb88321 [diff] | |
parent | 845a1b7be951bf9fefdf61eaa63f4801410c2f33 [diff] |
[automerger skipped] Merge "Whitelist packages from VPN lockdown: DPM API." am: c9d834e3f5 am: aade923534 -s ours am: 845a1b7be9 -s ours am skip reason: change_id I7508070f828fb7150df5d9e34846535d57c6a7c3 with SHA1 5cba336daf is in history Change-Id: Ica8f85aa4e1a7cb47abd90233806fcb3eb1a458d