AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b26be66..ec1c733 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7462,7 +7462,9 @@
}
/**
- * Provide haptic feedback to the user for this view.
+ * BZZZTT!!1!
+ *
+ * <p>Provide haptic feedback to the user for this view.
*
* <p>The framework will provide haptic feedback for some built in actions,
* such as long presses, but you may wish to provide feedback for your
@@ -7479,7 +7481,9 @@
}
/**
- * Like {@link #performHapticFeedback(int)}, with additional options.
+ * BZZZTT!!1!
+ *
+ * <p>Like {@link #performHapticFeedback(int)}, with additional options.
*
* @param feedbackConstant One of the constants defined in
* {@link HapticFeedbackConstants}