提交

2 years ago · 6c14d6cea3
parent 92d7cad9ec
commit 6c14d6cea3
1 changed files with 5 additions and 0 deletions
--- a/MiNote/src/net/micode/notes/ui/AlarmReceiver.java
+++ b/MiNote/src/net/micode/notes/ui/AlarmReceiver.java
@ -31,4 +31,9 @@ public class AlarmReceiver extends BroadcastReceiver {
        context.startActivity(intent);
    }
 }
+<<<<<<< wjy

+=======
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还需要深究但是对于setClass和addFlags的
+>>>>>>> local