tree a518310cfc6bcf99ea9569a5f45126fe4586fc3e
parent 818887068475f11de8f14d019cf3d73c9f6d0149
parent 8bc0ca8c74d993bffadd07700a830c078724defc
author TreeHugger Robot <treehugger-gerrit@google.com> 1591813526 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591813526 +0000

[automerger skipped] Merge "Make tether settings intent explicit" into rvc-dev am: 34d101b450 am: 8bc0ca8c74 -s ours

am skip reason: Change-Id I49187aee8a004caa890e2a73c0a28d280215c7d4 with SHA-1 3fe5434d19 is in history

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

Change-Id: I77d1d15d284190ee98321f7dfb8eaf8abd367fb9