tree 5b1b30510b4f68548205421c78ce2dbf0565568b
parent 7aa12de8429fd2c4abaf96b0c8937fcc3b0d8a93
parent ceca234921259355cd0d87352cbd8cd9863b7a38
author Treehugger Robot <treehugger-gerrit@google.com> 1622711697 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622711697 +0000

[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours

am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093

Change-Id: Icc0d493d7c6ff7e7dcf444309676ca8453c0894a