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

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