19fa6d4586
Merge commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp * commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a': Don't inflate the zoom button controller until we