OSDN Git Service

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


Trivial merge