tree 05a844f89fd748f0e20dfebf569d2f56e89ee5ea
parent cf6c4d171926860fe5ac1c9950f43b07b7b34982
parent 1a3c88062f174650bb43c6ca18e9d85daa12a3b0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590553048 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590553048 +0000

Merge "Don't set shelf height if we are in landscape. am: e50d7a2f54 am: f75d7c958f am: a9c0bbee04" into rvc-qpr-dev-plus-aosp am: 1a3c88062f

Change-Id: I87f22cac5c6ec8c285196b7dfa3cf643c1890d2b