tree d21290bb2573e3be2f773c646144d3b77dac2ade
parent a377c173b193de3f79c7bd245ffe5c9828c022e8
parent ff760448039f4ea2d4a3157e7b2e740374924602
author Nicholas Sauer <nicksauer@google.com> 1391658089 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391658089 -0800

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

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