Anthony Stange e3e5f29233 Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec am: 37cb1551a0 am: a2c19b719d ...

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

Change-Id: Ia5cedb12112b04885c3f9270b9171c6494b8d2af

2021-03-18 18:29:41 +00:00

..

android

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205

2021-03-18 18:25:54 +00:00

com/android

Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 2576238aec am: 37cb1551a0 am: a2c19b719d

2021-03-18 18:29:41 +00:00