merge from open-source master

Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59

diff --cc samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
index c7a2dfb,6e71207..7e061ed
--- 1/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
--- 2/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
@@@ -48,10 -43,9 +48,10 @@@ public class ForegroundService extends 
      static final String ACTION_FOREGROUND = "com.example.android.apis.FOREGROUND";
      static final String ACTION_BACKGROUND = "com.example.android.apis.BACKGROUND";
      
-     private static final Class[] mStartForegroundSignature = new Class[] {
 + // BEGIN_INCLUDE(foreground_compatibility)
+     private static final Class<?>[] mStartForegroundSignature = new Class[] {
          int.class, Notification.class};
-     private static final Class[] mStopForegroundSignature = new Class[] {
+     private static final Class<?>[] mStopForegroundSignature = new Class[] {
          boolean.class};
      
      private NotificationManager mNM;

diff --cc samples/ApiDemos/src/com/example/android/apis/app/LocalService.java
index 859969c,815fa6b..0c7c108
--- 1/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java
--- 2/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalService.java
@@@ -110,8 -113,7 +114,7 @@@ public class LocalService extends Servi
                         text, contentIntent);
  
          // Send the notification.
-         // We use a layout id because it is a unique number.  We use it later to cancel.
-         mNM.notify(R.string.local_service_started, notification);
+         mNM.notify(NOTIFICATION, notification);
      }
  }
 -
 +//END_INCLUDE(service)