tree f5227da5f339f75d10d85a8de4f0676a37076a1d
parent f6383ac3bb25a838c630940d72280f47c6d507fd
parent 73d8feb51410f15ae20a7cea40455781f7886208
author Justin Klaassen <justinklaassen@google.com> 1470884429 +0000
committer android-build-merger <android-build-merger@google.com> 1470884429 +0000

Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev am: 609770d34b
am: 73d8feb514

Change-Id: Ib9e3312110548ade5108cac0a7c8b3324b6bc2c2