am 5c675196: am 83340987: Merge "Use real screen width/height to calculate aspect ratio" into jb-mr1.1-dev

* commit '5c675196323e54c1fc22730cde9d13e53712c627':
  Use real screen width/height to calculate aspect ratio