tree c6035f19de6f9455310c3b234bd537f80a218d7e
parent dd07e3acc85c05522a56155447154c296a698df1
parent 51f5482c98bf2ee013c16b6f2e03a3b043f4f6b9
author Greg Kaiser <gkaiser@google.com> 1574891150 -0800
committer android-build-merger <android-build-merger@google.com> 1574891150 -0800

Merge "SecurityManager: Don't use iterator after erase()" am: 1fa8f658ed
am: 51f5482c98

Change-Id: I262da17071a1d9f3d7715af4997d3e3d22570ad7