OSDN Git Service

am 00925a3b: (-s ours) am d33b6217: DO NOT MERGE - New implementation for ScaleGestur...
authorAdam Powell <adamp@google.com>
Thu, 30 Aug 2012 21:31:33 +0000 (14:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Aug 2012 21:31:33 +0000 (14:31 -0700)
* commit '00925a3b883080fa6888ae9905394fc786465d26':
  DO NOT MERGE - New implementation for ScaleGestureDetector


Trivial merge