Commit d3c06bfc authored by Clare Bayley's avatar Clare Bayley Committed by Trevor Johns
Browse files

Resolve conflicts for merge of 6a1d10db from lmp-mr1-ub-dev to mnc-dev 

Merge: Merge "Add Stylus Info to BasicGestureDetect" into lmp-mr1-ub-docs

* commit '39cb9cb9':
  Add Stylus Info to BasicGestureDetect

Change-Id: I38b1b40c49fa54cc48b261b86ad61a7df8d4979b
parent 6ab42c36
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment