tree 20d57707d80d42f15ad21a402d5daf9f8d773543
parent 669666f430eb9bdd3f4a7d1d0074f92d7566b209
parent 51241a168c2e61ac4011fcde4c42025a2208fb71
author Paul Hu <paulhu@google.com> 1591633255 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591633255 +0000

Merge "Make tether settings intent explicit" am: 51241a168c am: 913cd757d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318286

Change-Id: I7eafc623fcd88b9544756295d84c936c2ab2507a