tree 72b68fa5e8830acb7df9746a209df6a2dc8200dd
parent 8297a09b3cf4384c457f1e3be965c5ec6597190c
parent 9c05c40060dece9e08a60ab6a6e3ff572c4dddca
author Hall Liu <hallliu@google.com> 1617233447 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617233447 +0000

Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" am: 2e0c2171fd am: ff4a4a29e7 am: 9c05c40060

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

Change-Id: Icf555d5e3bceda3bc1260b64c6d7394d4f9adb50