tree e38cb7ddac04b90c4b0e4d00b10a08fa53eddcb8
parent df0d9f68a2db6bfd0a2d280c9b1fcc5e1f6cfb5f
parent b484ff5eddd3e1b42e976ccac4ea6c41963919f5
author Jim Miller <jaggies@google.com> 1301540870 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1301540870 -0700

Merge "Get LockScreen working on phones."