tree 5c88a311bbd2d4589e306db5329ec563ff2c2869
parent 072ab9d882298378210c0c734b07774a50e0bebd
parent b1a9e89c04ea0af4d116e15e6154203e80747cad
author Nicholas Sauer <nicksauer@google.com> 1391658654 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391658654 +0000

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