am 40f24016: am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1

* commit '40f240166a5d4c92690aeb991f1711bf3a733ef5':
  Don't limit zoom scale change by the minimum increment.