tree c38ca9fc9e73235050cd2cd8c50fd5eaec82ae7a
parent 4d42782e8cbc221dbfdd32a0d2ce74a81d97d7b3
parent 847d17fcba7e0fab3093d05b5405554df91c08e2
author Mady Mellor <madym@google.com> 1427821903 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1427821904 +0000

Merge "Recognizes the stylus scale gesture in ScaleGestureDetector"