tree a82fabea70798b3431b94bd0b9161015d2db0d52
parent 65793dc043eee43790137f79beeba7ed8b123902
parent c9a0d7dfda78def90a615504cb56445c4904424c
author Peter Ng <petergng@google.com> 1319824434 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319824434 -0700

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