OSDN Git Service

Merge \\"Snooze schedule rules that were canceled by alarms.\\" into nyc-mr1-dev...
authorJulia Reynolds <juliacr@google.com>
Wed, 20 Jul 2016 20:51:12 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 20:51:12 +0000 (20:51 +0000)
am: 261b655396

Change-Id: Icd0ff5a828d0f2a39bb0e39085cd9fd7788f354f


Trivial merge