OSDN Git Service

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev...
authorDianne Hackborn <hackbod@google.com>
Mon, 19 Jun 2017 17:30:55 +0000 (17:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 17:30:55 +0000 (17:30 +0000)
am: 8323830495

Change-Id: Ie4fe65681b0fa537288923154f84794dfa779dfc


Trivial merge