tree f216221affe35a8dc792d83ac2cb6f2fbe98fcc6
parent 802b7efa3eca340752e67bc724efb69846b9b0d4
parent 42dbff65d670cf4d1e2c314733d821245c30161b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582153763 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582153763 +0000

[automerger skipped] Merge "Use framework-tethering-stub instead of framework-tethering" am: 3e4ab5c2b5 am: 101b4e2bb5 am: 42dbff65d6 -s ours
am skip reason: Change-Id I97ef83f7f9b4c1376f373713036f5256318f1050 with SHA-1 2c153703e4 is in history

Change-Id: I1771917998eeda2d18abb1f576e5091828651ea0