| commit | 493e037ce3d6b708f985fc97d34f52f2175928bc | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Fri Sep 28 12:24:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 12:24:08 2012 -0700 |
| tree | d8521b857133eb23f7f187ff89c44623bb06f618 | |
| parent | 2d99cd47e13554a1cb8f8d8ca550b9c10833d9f7 [diff] | |
| parent | 808ce66a08bbd2604d71f3368788ba7496f71482 [diff] |
am 808ce66a: Merge "ScaleGestureDetector does the safety dance." into jb-mr1-dev * commit '808ce66a08bbd2604d71f3368788ba7496f71482': ScaleGestureDetector does the safety dance.