tree dda23262c8fedd883abb187f369fea84b746c67d
parent 07840d31c3c53b909b94689f883290607a211083
parent adefc31fdeec8199e3c8cebdaecc8d2784c8f0d6
author Dianne Hackborn <hackbod@google.com> 1312423084 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312423084 -0700

Merge "Whoops also need to move notification shade above lock screen."