Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp * commit '26cab06472badee374ac854f5a210991c37c4493': Allow two finger pan and scale on touchscreens with
Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp * commit '26cab06472badee374ac854f5a210991c37c4493': Allow two finger pan and scale on touchscreens with