Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into...
Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601a am: c8a35d64
am: c9eb2c47
* commit 'c9eb2c47':
Left and right margins for watch preferences.
Change-Id: I78b69b3d952370bfc845cd93c35cd16c5817f8f3