tree d4c7f65d63d17434ea04029bf7be76559e30568b
parent 96756e99e2f7e8d3e75aa405951b1538116c1c7a
parent 944e41fe32ea863b61cab0f8002a86f6e5a0412b
author Chris Wren <cwren@android.com> 1386271797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386271797 +0000

am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."

* commit '944e41fe32ea863b61cab0f8002a86f6e5a0412b':