OSDN Git Service

Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
authorChristine Franks <christyfranks@google.com>
Mon, 26 Jun 2017 19:28:24 +0000 (19:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 26 Jun 2017 19:28:30 +0000 (19:28 +0000)

Trivial merge