Merge "Fix sample code insertion."
diff --git a/core/java/android/app/DeviceAdmin.java b/core/java/android/app/DeviceAdmin.java
index b9a84b7..ecbad01 100644
--- a/core/java/android/app/DeviceAdmin.java
+++ b/core/java/android/app/DeviceAdmin.java
@@ -34,15 +34,13 @@
* {@link android.Manifest.permission#BIND_DEVICE_ADMIN} permission. A typical
* manifest entry would look like:</p>
*
- * <pre>{@include development/samples/ApiDemos/AndroidManifest.xml
- * device_admin_declaration}</pre>
+ * {@sample development/samples/ApiDemos/AndroidManifest.xml device_admin_declaration}
*
* <p>The meta-data referenced here provides addition information specific
* to the device administrator, as parsed by the {@link DeviceAdminInfo} class.
* A typical file would be:</p>
*
- * <pre>{@include development/samples/ApiDemos/res/xml/sample_device_admin.xml
- * meta_data}</pre>
+ * {@sample development/samples/ApiDemos/res/xml/sample_device_admin.xml meta_data}
*/
public class DeviceAdmin extends BroadcastReceiver {
private static String TAG = "DevicePolicy";
diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java
index c4e1877..8ec5bd4 100644
--- a/core/java/android/app/Service.java
+++ b/core/java/android/app/Service.java
@@ -292,8 +292,8 @@
* callback in that case. The <code>handleCommand</code> method is implemented by
* you as appropriate:
*
- * <pre>{@include development/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
- * start_compatibility}</pre>
+ * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
+ * start_compatibility}
*
* @param intent The Intent supplied to {@link android.content.Context#startService},
* as given. This may be null if the service is being restarted after
@@ -474,8 +474,8 @@
* level 5, you can use the following model to call the the older {@link #setForeground}
* or this modern method as appropriate:
*
- * <pre>{@include development/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
- * foreground_compatibility}</pre>
+ * {@sample development/samples/ApiDemos/src/com/example/android/apis/app/ForegroundService.java
+ * foreground_compatibility}
*
* @param id The identifier for this notification as per
* {@link NotificationManager#notify(int, Notification)