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