Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp * commit 'd79d1c72991e587294432e80d091e3ae26a0c103': If ZoomButttonsController detects more than one pointer,
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp * commit 'd79d1c72991e587294432e80d091e3ae26a0c103': If ZoomButttonsController detects more than one pointer,