tree bdc243a2349662ab1aa75785c95a311287abbf73
parent e5aa15519c3a0213951893b22c0e091400fcb994
parent 589787a27d1cb5c381eebfd65ac41b6e1798a581
author Nicholas Sauer <nicksauer@google.com> 1391657258 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391657258 -0800

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

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