tree 75f529a8e386805963d9d59bf8bdf1c855677c0b
parent c50438c802355dff714b04f42a32e518cb9e91d8
parent d3fbe683bb52c8be9a14783bb70f32a46cf6f6db
author Jan-Willem Maarse <maarse@google.com> 1408565038 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408560192 +0000

Merge "Ignore generic motion events if custom content doesn't allow scrolling" into ub-now-porkchop