Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 933cfdef authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp 

* changes:
  [automerger skipped] Add getDnsNetId cmd in DnsProxyListener am: 711b777bc8 -s ours am: d70c99a263 -s ours am skip reason: change_id Ie81751b762a780ed843bea255c1507ed03660c0e with SHA1 4bd0e67a95 is in history
  [automerger skipped] Remove explicitlySelected bit for vpn fallthrough rule am: 0a5f897796 -s ours am: ca92df9010 -s ours am skip reason: change_id I76a1ac1304fad16b31d4b80196fab56ecd63171e with SHA1 f0f002030a is in history
parents b340f0ec cc9a6218
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment