tree c1783c891f45dfb1c1b44050a12c0b02d6a266f8
parent e4d18addd352d1f25f737d364bfadd614459e114
parent c78a72d80c069bef983151398ae8f324c769db74
author Mark Chien <markchien@google.com> 1586858845 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586858845 +0000

[automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365 am: db0698b0a0 am: c78a72d80c

Change-Id: I0ef964128dd034af024e589bf898ef325cda03ce