tree e55100fb119852053acb8e68db44e9b6e390c1d6
parent c9d1d5f35091226e96fcfa91817480f589eb36e2
parent 9f1221f87e4762457c8fa0b4c0e5a291d9aef5c9
author Mindy Pereira <mindyp@google.com> 1379462274 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379462274 +0000

Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-dev