am a2d32f3c: am 7633540c: Merge "Keep min/max zoom scale in proportion when zoom density changes." into honeycomb

* commit 'a2d32f3c48283d3c9c7d8e25704de86e26bc62f6':
  Keep min/max zoom scale in proportion when zoom density changes.