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

Change-Id: I97671e62de26919e391dbb2686511584c59ab990

2014-10-02 11:48:08 +01:00

..

Gesture.java

…

GestureConstants.java

…

GestureLibraries.java

…

GestureLibrary.java

…

GestureOverlayView.java

resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp

2014-10-02 11:48:08 +01:00

GesturePoint.java

…

GestureStore.java

…

GestureStroke.java

…

GestureUtils.java

…

Instance.java

…

InstanceLearner.java

…

Learner.java

…

OrientedBoundingBox.java

…

package.html

…

Prediction.java

…