[automerger skipped] Merge "emulator: remove vintf and some whitelists" am: 3c9230183d am: 4febe1e5b3

am: dac4bb3700 -s ours
am skip reason: change_id Ie204f22de49f0593a067f8cb52d3dea371fd2e13 with SHA1 4d2511e0d0 is in history

Change-Id: I97f2bbfca628d593b6a73c760c9725d9324ab1d5
This commit is contained in:
Bo Hu 2019-10-30 07:20:35 -07:00 committed by android-build-merger
commit 685f0ede31

Diff Content Not Available