tree c841de45eb3523c4ea1618eefad5e242c92e343b
parent 2facafe892627a86d53c6552cde01dc13fb1f2a6
parent 7943c7b5abae3b87e56f2c2027f01c44f98574b6
author Mady Mellor <madym@google.com> 1568936395 -0700
committer android-build-merger <android-build-merger@google.com> 1568936395 -0700

Merge changes from topic "landscape-jeeze" into qt-qpr1-dev
am: 7943c7b5ab

Change-Id: If8275df4e70a2fac55e9aaaa5c35ff7db3ab096d