am 238f8fe6: Merge change 21652 into donut

Merge commit '238f8fe645271a0ef891553e1c8c3c964c3c876d' into eclair

* commit '238f8fe645271a0ef891553e1c8c3c964c3c876d':
  Make ZoomButtonsController public.