tree 430cd800c1cc1c00281d29d04f779eea4c1bf9a1
parent 4464cb95f8cd91b0902ae90bf072859f2aa4e64e
parent 071313e671bb249730260eae4187a884f74e8013
author Jim Miller <jaggies@google.com> 1321316047 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321316047 -0800

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