tree 45dcc0a9856b88a39d2e7c15f49d45a3886408e4
parent d8b866e615d498660d072d071530e4cab3fdd187
parent ae0aed951ba13474e5839ac5e43febbc0a004160
author Julia Reynolds <juliacr@google.com> 1469047513 +0000
committer android-build-merger <android-build-merger@google.com> 1469047513 +0000

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

Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290