tree db80da3295dd4ab8ff007f245f2c75cb41397bcd
parent 0d5f5e2b97758b38ecc573c2aecd13cb31bb6cae
parent d27a6319f21800cf423e0a7d3d49acc88eaa38ed
author TreeHugger Robot <treehugger-gerrit@google.com> 1508962299 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1508962299 +0000

Merge "Prevent touch delegate from blocking parent events"