Commit b947a137 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by android-build-merger
Browse files

[automerger skipped] Merge changes from topic "resampling for multiple pointers" am: f1b536db 

am: b004c97d  -s ours

Change-Id: Ib3e4189f58355c922d1a137fce2815c9425ef438
parents a85157fc b004c97d
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