Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4170099 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7587 

* changes:
  Fixes merge conflict.
parents a2b0d2e4 e9dcb803

core/java/android/view/MotionEvent.java

+0 −8
Original line number Diff line number Diff line
@@ -396,7 +396,6 @@ public final class MotionEvent implements Parcelable { 
    }



    /**

<<<<<<< HEAD:core/java/android/view/MotionEvent.java

     * Returns the time (in ns) when this specific event was generated.

     * The value is in nanosecond precision but it may not have nanosecond accuracy.

     *
@@ -409,13 +408,6 @@ public final class MotionEvent implements Parcelable { 
    /**

     * Returns the X coordinate of this event.  Whole numbers are pixels; the 

     * value may have a fraction for input devices that are sub-pixel precise. 

|||||||

     * Returns the X coordinate of this event.  Whole numbers are pixels; the 

     * value may have a fraction for input devices that are sub-pixel precise. 

=======

     * Returns the X coordinate of this event.  Whole numbers are pixels; the

     * value may have a fraction for input devices that are sub-pixel precise.

>>>>>>> cafdea61a85c8f5d0646cc9413a09346c637f43f:core/java/android/view/MotionEvent.java

     */

    public final float getX() {

        return mX;