tree 245b48c38716e516db7061bc03cce058e6fddd34
parent 832d1543fb48263a36e31ce97e9718ae6dd2e01a
parent de615155932f01c69b034677ad88585059bdf967
author David Su <dysu@google.com> 1601400813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601400813 +0000

[automerger skipped] Merge "LINK_CONFIGURATION_CHANGED broadcast: stop including EXTRA_LINK_PROPERTIES" into mainline-prod am: de61515593 -s ours

am skip reason: Change-Id I57c3db765283d8bbb410a0b790e27054c5ab561a with SHA-1 c8a57301ea is in history

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

Change-Id: Ib401c7f22867f8d1f47f09d1739af9e593063637