am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from...
am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb
* commit '57d472a5':
Fix 3381324: Restart ripples when the user moves away from the edge.