tree 2055d841ee4f55086e1d97e0f84eb83e9ca26805
parent ce89135a53b1f5c0e7f34dbae12794f4421d9390
parent 322934699433d703fa35505d72028abbcf8ce45f
author Jim Miller <jaggies@google.com> 1383772767 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383772767 -0800

am 32293469: Merge "Fix issue where transport control shows up off-screen on tablets" into klp-dev

* commit '322934699433d703fa35505d72028abbcf8ce45f':
  Fix issue where transport control shows up off-screen on tablets