OSDN Git Service

Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
authorJulia Reynolds <juliacr@google.com>
Wed, 8 Jun 2016 20:20:43 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 20:20:43 +0000 (20:20 +0000)
am: e1451c4e30

Change-Id: I2fe8f9dbc048a830e6c06b4797151aaf306ca481


Trivial merge