tree e29590b07cba6fcc844b2e21a8e243e3883366b5
parent 607653e9876ffe2ee337945e587afc03a01b0fad
parent 6d2d5623422ca8afb74459e38519e0367da7dedd
author Nicholas Sauer <nicksauer@google.com> 1391657073 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391657073 -0800

am 6d2d5623: am e9ea138a: Merge "Revert "Use real screen width/height to calculate aspect ratio"" into jb-dev

* commit '6d2d5623422ca8afb74459e38519e0367da7dedd':
  Revert "Use real screen width/height to calculate aspect ratio"