Merge commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718' into eclair-mr2-plus-aosp * commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718': divide mRestoredScale before use
Merge commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718' into eclair-mr2-plus-aosp * commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718': divide mRestoredScale before use