Lucas Lin 9cf690d187 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 am: e5d40c1933 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb

2021-03-02 19:54:22 +00:00

..

android

Merge "Fix copyright license of VpnTransportInfo"

2021-02-26 03:38:59 +00:00

com/android

Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 am: e5d40c1933

2021-03-02 19:54:22 +00:00