| commit | f4bf67012b2109ead9a4cb9c4407563fc3671255 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <[email protected]> | Tue Jul 29 17:40:30 2014 +0000 |
| committer | Android (Google) Code Review <[email protected]> | Fri Jul 25 21:16:23 2014 +0000 |
| tree | d2060dee6c3c755a70b25efbb068b5030add625b | |
| parent | 6fdac3357eb3cc0d7123535f3f2f95db8a17807d [diff] | |
| parent | b6417b8b9492d88ccfbb723decaece1bb9ff0f73 [diff] |
Merge "Don't double-cancel the active ripple" into lmp-dev