am 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case....
am 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
Merge commit '4ea1eea5' into kraken
* commit '4ea1eea5':
Redesigned keyguard layout in the no-SIM case. DO NOT MERGE