Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java

@@ -204,8 +204,8 @@ public class Utils {
            Intents is to send a different second param each time,
            though the docs say that param's ignored.
         */
-        PendingIntent pi = 
-            PendingIntent.getActivity( context, Utils.nextRandomInt(), intent, 
+        PendingIntent pi = null == intent ? null
+            : PendingIntent.getActivity( context, Utils.nextRandomInt(), intent, 
                                          PendingIntent.FLAG_ONE_SHOT );
 
         Notification notification =