OSDN Git Service

am 4368f19f: am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into...
authorJohn Spurlock <jspurlock@google.com>
Wed, 23 Jul 2014 01:19:26 +0000 (01:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Jul 2014 01:19:26 +0000 (01:19 +0000)
* commit '4368f19f5011891268da673dee4636cf61f3cae7':
  Wire up CATEGORY_ALARM and CATEGORY_EVENT.


Trivial merge