tree 969664bc8991c1d0b3c648d428fb24c2cfea4a54
parent c4cd2217d3591dd692c9c26a6779c51d7271f80b
parent a3a37fd25b7c93e1ce0d5141104a8df0fd0fca5c
author Nicholas Sauer <nicksauer@google.com> 1391657782 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1391657782 -0800

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 'a3a37fd25b7c93e1ce0d5141104a8df0fd0fca5c':
  Revert "Use real screen width/height to calculate aspect ratio"