tree 2105fab76f2ff370488999256efc09ae0c899935
parent 2562ab48562fd0a47696bfbc2b326bebb418dae3
parent 19547685bba4e904d0f78209d0221669610323b0
author Treehugger Robot <treehugger-gerrit@google.com> 1612276884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612276884 +0000

Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I691da785142fee5967674ac2cf1261e71c1f16e3