tree d5857eba541bc4080941b5d6ecca85a0a44ca906
parent f83fdd0864f32a3e8d4a7d3a127759cf30b503a9
author Alan Viverette <alanv@google.com> 1406654510 -0700
committer Alan Viverette <alanv@google.com> 1406654510 -0700

Don't double-cancel the active ripple

BUG: 16651728
Change-Id: Ibe413eabf9644c2ac9a5c8c1418ff996dacf606a