Merge "Docs: Moved // BEGIN_INCLUDE a few lines up so readers understand the context of the Binding class (it's an inner-class)" into oc-mr1-dev am: 4204ce2ae1

am: 05e8c5bcf9

Change-Id: Id058d0ef9d65fe6a907860ac28fcf3caed2b1464

2 files changed, 7 insertions, 6 deletions

diff --git a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java
index a6c3fd822..536bd8117 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/LocalServiceActivities.java
@@ -79,18 +79,18 @@ public class LocalServiceActivities {
 
     // ----------------------------------------------------------------------
 
+// BEGIN_INCLUDE(bind)
     /**
      * Example of binding and unbinding to the local service.
      * This demonstrates the implementation of a service which the client will
-     * bind to, receiving an object through which it can communicate with the service.</p>
+     * bind to, receiving an object through which it can communicate with the service.
      * 
-     * <p>Note that this is implemented as an inner class only keep the sample
+     * Note that this is implemented as an inner class only keep the sample
      * all together; typically this code would appear in some separate class.
      */
     public static class Binding extends Activity {
         private boolean mIsBound;
 
-// BEGIN_INCLUDE(bind)
         private LocalService mBoundService;
         
         private ServiceConnection mConnection = new ServiceConnection() {
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java b/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java
index 8d0ac8c16..9c0cacd1b 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/MessengerServiceActivities.java
@@ -21,16 +21,17 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 public class MessengerServiceActivities {
+
+// BEGIN_INCLUDE(bind)
     /**
      * Example of binding and unbinding to the remote service.
      * This demonstrates the implementation of a service which the client will
-     * bind to, interacting with it through an aidl interface.</p>
+     * bind to, interacting with it through an aidl interface.
      * 
-     * <p>Note that this is implemented as an inner class only keep the sample
+     * Note that this is implemented as an inner class only keep the sample
      * all together; typically this code would appear in some separate class.
      */
     public static class Binding extends Activity {
-// BEGIN_INCLUDE(bind)
         /** Messenger for communicating with service. */
         Messenger mService = null;
         /** Flag indicating whether we have called bind on the service. */