OSDN Git Service

Merge "Do not unsnooze canceled notifications." into oc-dev
authorJulia Reynolds <juliacr@google.com>
Mon, 1 May 2017 22:31:55 +0000 (22:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 22:31:55 +0000 (22:31 +0000)
am: 8183328af7

Change-Id: I363a606d1f190c2da6cc8fbd76ef0b093efa0a58


Trivial merge