am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1

* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e':
  Consider mInitialScale when setting min zoom scale.