OSDN Git Service

Merge "If ZoomButttonsController detects more than one pointer, give up the control...
authorGrace Kloba <klobag@google.com>
Mon, 18 Jan 2010 23:21:38 +0000 (15:21 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 18 Jan 2010 23:21:38 +0000 (15:21 -0800)

Trivial merge