From f6e25d6e20659409d1a194b840e9b07a88b3fd50 Mon Sep 17 00:00:00 2001 From: jennadeng Date: Sun, 27 Sep 2015 08:13:06 -0400 Subject: [PATCH] Revert "pull request" --- .idea/.name | 2 +- .idea/encodings.xml | 6 --- .idea/gradle.xml | 3 +- .idea/misc.xml | 5 ++- mobile/mobile.iml | 38 +++++++++--------- .../java/hackny/awkscape/AlarmActivity.java | 10 ----- mobile/src/main/res/layout/activity_alarm.xml | 6 +-- mobile/src/main/res/mipmap-hdpi/calling.png | Bin 1200870 -> 0 bytes mobile/src/main/res/mipmap-hdpi/received.png | Bin 1184174 -> 0 bytes .../hackny/awkscape/MainWatchActivity.java | 6 --- wear/wear.iml | 6 +-- 11 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 .idea/encodings.xml delete mode 100644 mobile/src/main/res/mipmap-hdpi/calling.png delete mode 100644 mobile/src/main/res/mipmap-hdpi/received.png diff --git a/.idea/.name b/.idea/.name index 363e30f..9b4330a 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Awkscape \ No newline at end of file +Awkscape \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0804331..af69317 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,8 @@