Merge branch 'master' of https://github.com/google/iosched
diff --git a/android/src/main/java/com/google/samples/apps/iosched/gcm/GCMRedirectedBroadcastReceiver.java b/android/src/main/java/com/google/samples/apps/iosched/gcm/GCMRedirectedBroadcastReceiver.java
index f928e6d..2340454 100644
--- a/android/src/main/java/com/google/samples/apps/iosched/gcm/GCMRedirectedBroadcastReceiver.java
+++ b/android/src/main/java/com/google/samples/apps/iosched/gcm/GCMRedirectedBroadcastReceiver.java
@@ -22,7 +22,6 @@
import android.content.Context;
/**
- * @author trevorjohns@google.com (Trevor Johns)
*/
public class GCMRedirectedBroadcastReceiver extends GCMBroadcastReceiver {
diff --git a/doc/BUILDING.md b/doc/BUILDING.md
index 38bb756..3bbac7b 100644
--- a/doc/BUILDING.md
+++ b/doc/BUILDING.md
@@ -105,8 +105,7 @@
./gradlew -Plpreview installLpreviewDebug
-You will need a device flashed with the Android L preview system image, or
-you can use the emulator.
+You will need a device flashed with the Android L preview system image.
# Server-side setup
diff --git a/doc/IMAGES.md b/doc/IMAGES.md
index 76feba6..2fc995c 100644
--- a/doc/IMAGES.md
+++ b/doc/IMAGES.md
@@ -77,7 +77,7 @@
URL | Image size
--- | ----------
-myserver.com/images/**__w-200-400-600-800-1000__**/session1.jpg | original
+myserver.com/images/**\_\_w-200-400-600-800-1000\_\_**/session1.jpg | original
myserver.com/images/w200/session1.jpg | 200px wide
myserver.com/images/w400/session1.jpg | 400px wide
myserver.com/images/w600/session1.jpg | 600px wide
diff --git a/gcm-server/build.gradle b/gcm-server/build.gradle
index 3079d11..dc529e3 100644
--- a/gcm-server/build.gradle
+++ b/gcm-server/build.gradle
@@ -52,7 +52,6 @@
downloadSdk = true
appcfg {
- email = 'mangini@google.com'
passIn = true
oauth2 = true
