OSDN Git Service

Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
authorMady Mellor <madym@google.com>
Thu, 20 Jul 2017 00:09:05 +0000 (00:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 00:09:05 +0000 (00:09 +0000)
am: f113a07d9e

Change-Id: I71e7c2757c1fab1dfdcd59ab3dbf695179899fe7


Trivial merge