tree d253770a5f8df0abde34b99684769fa6a1a36547
parent 69c5cfed157179563c8e14db9d58082df7e185ec
parent b6b0dee076243bd41097bf4b2484cbfaea92bf9a
author Treehugger Robot <treehugger-gerrit@google.com> 1605740030 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605740030 +0000

Merge "Fix Broken test: libcore.java.security.ProviderTest#test_Provider_Properties" am: c778d8e747 am: 796b8b3687 am: ee01197b77 am: b6b0dee076

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503571

Change-Id: I5607d564f17134d746431a7e0f024844030a5753