tree 7f102d0272a547cf7efd4ad55018e80d3ce3857b
parent e7ccfca9da333e755d1b1fa9065543db788323b6
parent 9d3538260b67052ab977ddf3b3091657f6d50518
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576851197 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576851197 +0000

[automerger skipped] Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: 25cc1f47c5 am: 08074c62b0 -s ours
am skip reason: Change-Id Ib051bea724a256f9c4572b566e46ae7b9c4abe6e with SHA-1 e7ccfca9da is in history

Change-Id: Id5b74e1af8e1a4276137b4f3eb3d8ffc1a2c903c