Merge branch 'duan' of https://bdgit.educoder.net/pq36pyhjl/miNote2 into duan

# Conflicts:
#	src/main/java/net/micode/notes/ui/AlarmAlertActivity.java

src/main/java/net/micode/notes/ui/AlarmAlertActivity.java

@@ -13,8 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+<<<<<<< HEAD
 //test
 package net.micode.notes.ui;
+=======
+
+package net.micode.notes.ui;
+
+>>>>>>> ea0ba46500536be46ebbdf4516f38b38518ccdaa
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;