tree b7ce0bf212183b95385d63c604c9428201b4a8a8
parent d033e67afe04ba2c3360df7d8f2a7b3e3e85ab73
parent 5a31605a034e990a68567597bbf9ccbc8cb28494
author Jim Miller <jaggies@google.com> 1383773109 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383773109 -0800

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

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