Merge "Fixing the build for real." into jb-dev

Author: sganov

core/java/android/accessibilityservice/AccessibilityService.java

@@ -60,8 +60,7 @@
  * must also specify that it handles the "android.accessibilityservice.AccessibilityService"
  * {@link android.content.Intent}. Failure to declare this intent will cause the system to
  * ignore the accessibility service. Additionally an accessibility service must request
- * {@link android.Manifest.permission#BIND_ACCESSIBILITY_SERVICE
- * android.permission.BIND_ACCESSIBILITY_SERVICE} permission to ensure that only the system
+ * "android.permission.BIND_ACCESSIBILITY_SERVICE" permission to ensure that only the system
  * can bind to it. Failure to declare this intent will cause the system to ignore the
  * accessibility service. Following is an example declaration:
  * </p>

core/res/AndroidManifest.xml

@@ -1552,7 +1552,8 @@
         android:protectionLevel="signature" />
 
         <!-- Must be required by an {@link android.accessibilityservice.AccessibilityService},
-         to ensure that only the system can bind to it. -->
+         to ensure that only the system can bind to it.
+         @hide -->
     <permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"
         android:label="@string/permlab_bindAccessibilityService"
         android:description="@string/permdesc_bindAccessibilityService"