am 63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1

* commit '63dd319ebeea0421f8bf901b85b753dde1de74d7':
  Lockscreen on tablet is now using the same waveview widget as phone