tree 430cd800c1cc1c00281d29d04f779eea4c1bf9a1
parent 0fccb0ad9065beed9e0777750a104dc485d3ed51
parent 772deeafa377e1b73b4e3787ec2628e30bce38b9
author Jim Miller <jaggies@google.com> 1321316188 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321316188 -0800

am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1

* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
  Fix 5579440: Add transport control view to tablet unlock screens