Merge commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc' into eclair-plus-aosp * commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc': Account for find dialog height in content height
Merge commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc' into eclair-plus-aosp * commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc': Account for find dialog height in content height