am 235657db: am 73f8aa67: Merge change I4898b145 into eclair

Merge commit '235657dbe06c4fea8860ec9fef834a6b36da9700' into eclair-mr2-plus-aosp

* commit '235657dbe06c4fea8860ec9fef834a6b36da9700':
  Removed the fixed height in the sim unlock screen's header.