tree c00c2829006c0a4e147e91da4e428bed7e981485
parent 4b3a0e2385d828902b84d73b4969ecff8d36c176
parent 261b655396a08ecbf71e8ab4f0648bab027e01de
author Julia Reynolds <juliacr@google.com> 1469047872 +0000
committer android-build-merger <android-build-merger@google.com> 1469047872 +0000

Merge \\"Snooze schedule rules that were canceled by alarms.\\" into nyc-mr1-dev am: ae0aed951b
am: 261b655396

Change-Id: Icd0ff5a828d0f2a39bb0e39085cd9fd7788f354f