Neil Fuller c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp ...

Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7

2014-10-02 14:32:37 +01:00

..

Gesture.java

…

GestureConstants.java

…

GestureLibraries.java

…

GestureLibrary.java

…

GestureOverlayView.java

…

GesturePoint.java

…

GestureStore.java

…

GestureStroke.java

…

GestureUtils.java

…

Instance.java

…

InstanceLearner.java

…

Learner.java

…

OrientedBoundingBox.java

…

package.html

…

Prediction.java

…