tree 0fb38ce0c04aadab9985ae4c6c10f0ae6bef9dc1
parent fea8e02f939ce2d17e754b5b35a65078844e3a0c
parent d4ea082508742355a8a3e4c2dc7256d370a76781
author Nicholas Sauer <nicksauer@google.com> 1391658817 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391658817 +0000

am d4ea0825: am b1a9e89c: am c0206763: am ae8cc846: am 4f8604a2: 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 'd4ea082508742355a8a3e4c2dc7256d370a76781':
  Revert "Use real screen width/height to calculate aspect ratio"