Jeff Brown 681f745916 am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp ...

* commit '7d9a18eeb684e87da5a907c96d25da21918119b5':
  Remove edge slop handling from ScaleGestureDetector.

2012-06-12 12:41:11 -07:00

..

accessibility

…

animation

…

inputmethod

…

textservice

…

AbsSavedState.java

…

AccessibilityInteractionController.java

…

AccessibilityIterators.java

…

ActionMode.java

…

ActionProvider.java

…

Choreographer.java

…

CollapsibleActionView.java

…

CompatibilityInfoHolder.java

…

ContextMenu.java

…

ContextThemeWrapper.java

…

Display.java

…

DisplayEventReceiver.java

…

DisplayList.java

…

DragEvent.aidl

…

DragEvent.java

…

FallbackEventHandler.java

…

FocusFinder.java

…

FocusFinderHelper.java

…

GestureDetector.java

…

GLES20Canvas.java

…

GLES20DisplayList.java

…

GLES20Layer.java

…

GLES20RecordingCanvas.java

…

GLES20RenderLayer.java

…

GLES20TextureLayer.java

…

Gravity.java

…

HapticFeedbackConstants.java

…

HardwareCanvas.java

…

HardwareLayer.java

…

HardwareRenderer.java

…

IApplicationToken.aidl

…

InflateException.java

…

InputChannel.aidl

…

InputChannel.java

…

InputDevice.aidl

…

InputDevice.java

…

InputEvent.aidl

…

InputEvent.java

…

InputEventConsistencyVerifier.java

…

InputEventReceiver.java

…

InputQueue.java

…

IOnKeyguardExitResult.aidl

…

IRotationWatcher.aidl

…

IWindow.aidl

…

IWindowManager.aidl

…

IWindowSession.aidl

…

KeyCharacterMap.java

…

KeyEvent.aidl

…

KeyEvent.java

…

LayoutInflater.java

…

Menu.java

…

MenuInflater.java

…

MenuItem.java

…

MotionEvent.aidl

…

MotionEvent.java

…

OrientationEventListener.java

…

OrientationListener.java

…

package.html

…

PointerIcon.aidl

…

PointerIcon.java

…

RemotableViewMethod.java

…

ScaleGestureDetector.java

…

SoundEffectConstants.java

…

SubMenu.java

…

Surface.aidl

…

Surface.java

…

SurfaceHolder.java

…

SurfaceSession.java

…

SurfaceView.java

…

TextureView.java

…

TouchDelegate.java

…

VelocityTracker.java

…

View.java

…

ViewConfiguration.java

…

ViewDebug.java

…

ViewGroup.java

…

ViewManager.java

…

ViewParent.java

…

ViewPropertyAnimator.java

…

ViewRootImpl.java

…

ViewStub.java

…

ViewTreeObserver.java

…

VolumePanel.java

…

Window.java

…

WindowManager.aidl

…

WindowManager.java

…

WindowManagerImpl.java

…

WindowManagerPolicy.java

…

WindowOrientationListener.java

…