tree 6de5b7883e3118c0c4908f2d1fb51ea03e6cf357
parent 8407a8ccacd82eab09e854c842a6772287f4ec7d
parent c744ad246ef8f8dd0dd9aa268bf99573da6c8ea8
author Steve Elliott <steell@google.com> 1592233935 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592233935 +0000

Merge "Fix occasional bad placement of Conversation header" into rvc-dev am: c744ad246e

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

Change-Id: I1562bf706f7614da400bd5039b87b1bfac22507c