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

* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
  Consider mInitialScale when setting min zoom scale.
tree: ffa8444c8ca09fd26bed60ad7273697d26037c23
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE