tree c282de5f3f6cd12a1218d712c8ba99095018e206
parent b88311685c84fe4a5b763c510cc630c9d4b1d036
parent 297d789d444626191ff6dc29eb43aeaa1f917969
author Dianne Hackborn <hackbod@google.com> 1349649029 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349649030 -0700

Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev