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