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

* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
  Consider mInitialScale when setting min zoom scale.