tree 8299759c0e011a237e0dc762f08343b167090c6f
parent 6788e028c363583406d513d66d9a78576f984302
parent 35d0e1d11c046b5e5ddf6d12c1a09becb8561af0
author Craig Mautner <cmautner@google.com> 1336777630 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336777630 -0700

Merge "Keep launcher screen from flashing over lockscreen" into jb-dev