Skip to content
Commit c58c817e authored by Yuri Lin's avatar Yuri Lin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Allow conversation channels to inherit canBypassDnd from their... 

Merge "Revert "Allow conversation channels to inherit canBypassDnd from their parent."" into tm-qpr-dev am: 70a74616 am: 5f272fbf

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



Change-Id: I367f965d7a399e8ba0c1ad5714f74129402b23df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b08eb3ec 5f272fbf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment