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:45:13 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 20:45:13 +0000 (20:45 +0000)
commit261b655396a08ecbf71e8ab4f0648bab027e01de
tree45dcc0a9856b88a39d2e7c15f49d45a3886408e4
parentd8b866e615d498660d072d071530e4cab3fdd187
parentae0aed951ba13474e5839ac5e43febbc0a004160
Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
am: ae0aed951b

Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
core/java/android/service/notification/ZenModeConfig.java