tree b779ae1bf94f03d770440d6ddad86e5792f55136
parent a18a63b23ae82e2ea946f325f427b39f648135e0
parent e1451c4e308c3dbdfc629bc4c6c2e0a94b4a8065
author Julia Reynolds <juliacr@google.com> 1465410244 +0000
committer android-build-merger <android-build-merger@google.com> 1465410244 +0000

Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
am: e1451c4e30

Change-Id: I1b1cbb8c432bcbbbf7713144044831bcb09e4528