commit | 22b1c63d518004db53f98edcf131856f7bbdd8b4 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Feb 10 07:20:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 07:20:26 2021 +0000 |
tree | e5c61cd5dd5a3a856228bbcbdc73c396ce6d5192 | |
parent | ecac1d2479165d8edd3c41d546cd72104ccd2b2c [diff] | |
parent | 5eac15c044da92ee33b69168d5552a09f0779db4 [diff] |
Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 5e21b83410 am: 5eac15c044 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572981 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If16c695f15a12615811545836b4117225097d6a4