Bug 831741 - Followup: Remove remaining __cplusplus bits from /js (with exceptions). r=jorendorff
Bug 880737 - Cancel retry timer while pausing OTA download. r=bbondy