Aaron Huang 5b748de126 Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c am: 4bec1c714d ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9188685fe0bb5ee7dfe2c0538fea6644b2cd642e

2021-02-05 12:50:16 +00:00

..

android

Merge "Update frameworks to use unbundled version of BouncyCastle."

2021-02-02 14:37:05 +00:00

com/android

Merge "Update VpnTest for new restricted API" am: 20507cf1f9 am: 1fb754cc9c am: 4bec1c714d

2021-02-05 12:50:16 +00:00