Revert to 271087b

.gitignore

@@ -1,40 +1,24 @@
-<<<<<<< HEAD
 # Built application files
 *.apk
 *.ap_
 
 # Files for the Dalvik VM
-=======
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
->>>>>>> ioschedLarry/master
 *.dex
 
 # Java class files
 *.class
 
-<<<<<<< HEAD
 # Generated files
 bin/
 gen/
 
 # Gradle files
 .gradle/
-=======
-# generated files
-bin/
-gen/
-out/
->>>>>>> ioschedLarry/master
 build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-<<<<<<< HEAD
 # Proguard folder generated by Eclipse
 proguard/
 
@@ -46,30 +30,3 @@ proguard/
 
 # Android Studio captures folder
 captures/
-=======
-# Eclipse project files
-.classpath
-.project
-
-# Windows thumbnail db
-.DS_Store
-
-# IDEA/Android Studio project files, because
-# the project can be imported from settings.gradle
-.idea
-*.iml
-
-# Old-style IDEA project files
-*.ipr
-*.iws
-
-# Local IDEA workspace
-.idea/workspace.xml
-
-# Gradle cache
-.gradle
-
-# Sandbox stuff
-_sandbox
-
->>>>>>> ioschedLarry/master

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 SMConf Android App
 ==================
 
@@ -21,39 +20,6 @@ With the app, you can:
 
 
 ##Build
-=======
-Google I/O Android App
-======================
-
-Google I/O is a developer conference held each year with two days of deep
-technical content featuring technical sessions and hundreds of demonstrations
-from developers showcasing their technologies.
-
-This project is the Android app for the conference. The app supports devices
-running Android 4.0+, and is optimized for phones and tablets of all shapes
-and sizes.
-
-<h2>Source</h2>
-
-The source code in this repository reflects the app as of I/O 2015.
-
-<h2>Features</h2>
-
-With the app, you can:
-
-- View the conference agenda and edit your personal schedule
-- Sync your schedule between all of your devices and the I/O website
-- View detailed session, code lab, office hours, and speaker information,
-  including speaker bios, photos, and Google+ profiles
-- Participate in public #io15 conversations on Google+
-- Guide yourself using the vector-based conference map
-- Get a reminder a few minutes before sessions in your schedule are due to
-  start
-- Play "I/O Live" session video streams
-- Send feedback on sessions, from your phone/tablet.
-
-<h2>How to Work with the Source</h2>
->>>>>>> ioschedLarry/master
 
 We hope the source code for this app is useful for you as a reference or starting point for creating your own apps. Here is some additional reading to help you better understand and reuse this code.
 
@@ -63,25 +29,7 @@ We hope the source code for this app is useful for you as a reference or startin
   * [Use of GCM](doc/GCM.md)
   * [Customization guide](doc/CUSTOM.md)
 
-<<<<<<< HEAD
 
 ## License
 
-smconf-android is licensed under [Apache](LICENSE).
-=======
-<h2>Copyright</h2>
-
-    Copyright 2014 Google Inc. All rights reserved.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
->>>>>>> ioschedLarry/master
+smconf-android is licensed under [Apache](LICENSE).