| commit | d3c06bfcae316f85f3b0235612536dc7b82a8e57 | [log] [tgz] |
|---|---|---|
| author | Clare Bayley <clareb@google.com> | Fri Aug 14 17:28:39 2015 +0000 |
| committer | Trevor Johns <trevorjohns@google.com> | Mon Aug 17 08:09:37 2015 -0700 |
| tree | b804761599081e00870e191359696aff19d439e6 | |
| parent | 6ab42c36e877ca920212b0a1586268a2e855c2e3 [diff] |
Resolve conflicts for merge of 6a1d10d from lmp-mr1-ub-dev to mnc-dev Merge: Merge "Add Stylus Info to BasicGestureDetect" into lmp-mr1-ub-docs * commit '39cb9cb98b5241043c56c8ca238cd05e0781f848': Add Stylus Info to BasicGestureDetect Change-Id: I38b1b40c49fa54cc48b261b86ad61a7df8d4979b
