summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-10-20 13:54:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-20 13:54:09 -0700
commit18cbc0e58a0e68411dff655f116a7010c3f464a2 (patch)
tree76547f375381bb3155bf10bc3b697b29c73b54df
parente894ff7a7693fdc406b4f4b28cfd1d9d7d966b38 (diff)
parent3466e1fc6db1fed35e2707c67a9ab17673aaf9de (diff)
am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp * commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de': Doc change: escape angle brackets in javadoc comment.
-rw-r--r--core/java/android/hardware/SensorEvent.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/SensorEvent.java b/core/java/android/hardware/SensorEvent.java
index 2c5c9090eb14..98bf6328b440 100644
--- a/core/java/android/hardware/SensorEvent.java
+++ b/core/java/android/hardware/SensorEvent.java
@@ -177,12 +177,12 @@ public class SensorEvent {
* <h4>{@link android.hardware.Sensor#TYPE_ROTATION_VECTOR Sensor.TYPE_ROTATION_VECTOR}:</h4>
* The rotation vector represents the orientation of the device as a combination of an angle
* and an axis, in which the device has rotated through an angle theta around an axis
- * <x, y, z>. The three elements of the rotation vector are
- * <x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation
+ * &lt;x, y, z>. The three elements of the rotation vector are
+ * &lt;x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation
* vector is equal to sin(theta/2), and the direction of the rotation vector is equal to the
* direction of the axis of rotation. The three elements of the rotation vector are equal to
* the last three components of a unit quaternion
- * <cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>. Elements of the rotation
+ * &lt;cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>. Elements of the rotation
* vector are unitless. The x,y, and z axis are defined in the same way as the acceleration
* sensor.
*