tree e38d6dfd3eaf9fbdc5448eb330c4112fa5237151
parent a00624ca721d24f6f3b16671055794041b62baa2
parent 73cbdeb1277df4f6eac9ff13c6d1c3d6ba55465a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590552039 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1590552039 +0000

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