diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-04-20 18:35:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-20 18:35:57 +0000 |
| commit | 59c9a93fc268e226495d4ee8cf7c507c2ea2c433 (patch) | |
| tree | 30fbaa0b559bc0b5b65ef86ab104b58d20d67fe1 /core/java/android/view/MotionEvent.java | |
| parent | db973df830c32af8e2aeff256053299409f65dfd (diff) | |
| parent | 483abe2d8b819470d480c30df6effcebe578a1f0 (diff) | |
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev
Diffstat (limited to 'core/java/android/view/MotionEvent.java')
| -rw-r--r-- | core/java/android/view/MotionEvent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 7f927779f50d..3e72192e9b09 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -2067,7 +2067,7 @@ public final class MotionEvent extends InputEvent implements Parcelable { /** * Return the pointer identifier associated with a particular pointer - * data index is this event. The identifier tells you the actual pointer + * data index in this event. The identifier tells you the actual pointer * number associated with the data, accounting for individual pointers * going up and down since the start of the current gesture. * @param pointerIndex Raw index of pointer to retrieve. Value may be from 0 |