tree ed2d1a6350fd6e9ffc1ae78f4431f00c6d2e8ddd
parent 9dfcbb840380744a051bdc4921af3127f30a2af1
parent 40c37349390be0b3a69c8799847144a8b391a15c
author Alan Viverette <alanv@google.com> 1399077324 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1399077324 +0000

Merge "Fix ripple cancel"