tree be64e227adbad386b6a885c686f78d8a4e20f1e8
parent 8b82dd2c438cca136ab66b5b9e8931ebda4d98f5
parent 4904004ee33e6b99c2b58c2e5393c8b629b65d8d
author Romain Guy <romainguy@google.com> 1265770255 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265770255 -0800

Merge "Fix the lock screen."