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)
commitc82bcdfd00a8166394a1e3d26b0c3470b6907a71
tree17514c678db9bf448ad49f3ed7a7967670474ad6
parentacb2a9adf63b2f5cec4e192f36c6b40a292a4f02
parentfc04b1d8624391e4fc2ca11bc6c50dc0472d295c
am 4368f19f: am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev

* commit '4368f19f5011891268da673dee4636cf61f3cae7':
  Wire up CATEGORY_ALARM and CATEGORY_EVENT.