tree 5bb5af79de86f36c5b387cb46e6500aafe825976
parent af4f38149ecd02ec899884711bfbbd3fcce65504
parent 9f69fc714aa5dfbe0f711cb41dc7006b8ebbe43e
author Josh Gao <jmgao@google.com> 1508466942 +0000
committer android-build-merger <android-build-merger@google.com> 1508466942 +0000

Merge "Correctly call vector::erase after std::remove_if."
am: 9f69fc714a

Change-Id: I617c19ae04e179fa0ae45e7c7bf829ae65ef392b