OSDN Git Service

Merge "Assert if alarm callback is null" am: dec5621902 am: 14f7e98eeb
authorStanley Tng <stng@google.com>
Fri, 30 Nov 2018 08:43:48 +0000 (00:43 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Nov 2018 08:43:48 +0000 (00:43 -0800)
am: 54fe977827

Change-Id: I39b1a597d85112f1c59b91c0e25f4881a3a840d5


Trivial merge