tree bb2ccbe5fe3478bd81746f678a26c7bb856b0255
parent 61ab647c5ad9a101a01fff7f677fead8d37ebfba
parent 9d4593079b06e72f60ac1ab77a3530b0b2c13156
author Jean-Baptiste Queru <jbq@google.com> 1306422551 -0700
committer Android Code Review <code-review@android.com> 1306422551 -0700

Merge "fix scrolling bug upon pinch-zoom" into gingerbread