| commit | cca30a72acc473140988decd6b395f8d01400a83 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 18 18:25:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 18 18:25:54 2021 +0000 |
| tree | 3ae7c15c299643c8ec13482713d551e5e45941a3 | |
| parent | dc82a6413fd998d0e9f5386e0b121ebcd2918c69 [diff] | |
| parent | 7853e402050ba4e58d44a7e633f76b52ac4fd50f [diff] |
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265 Change-Id: I512785d414fcfd4819cdf26ff3c3403c049db475