tree 98cef34e79fca2e741ecdbee2906beddebe7ca72
parent 5134e64fffb45953ba7beefd4862cb09b9b19f7c
parent afe7f7e770ea439ce5b687f54c1dcdf2efb94c54
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583191586 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583191586 +0000

Merge "use vector::erase with std::remove_if" am: 01f322e6b1 am: afe7f7e770

Change-Id: I968b1f4916e63a94a8e0bc87570e2e14fce95e3a