Merge commit '1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77' into eclair-mr2-plus-aosp * commit '1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77': layout test rebase, bug fix
Merge commit '1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77' into eclair-mr2-plus-aosp * commit '1c7be08f6bc22d3718fd8bc9f9f5a0426ba17a77': layout test rebase, bug fix