tree 515b2af7d400f78a089c916b9f7af11946b1de63
parent 6ab3ea5f48abfd777d5bd18d92acc3bc766f78ce
parent d33b6217fc128652a72f1626bcaa5f3b754102c6
author Adam Powell <adamp@google.com> 1346362142 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346362142 -0700

am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector

* commit 'd33b6217fc128652a72f1626bcaa5f3b754102c6':
  DO NOT MERGE - New implementation for ScaleGestureDetector