OSDN Git Service

Merge "Reset mActiveController to null in DragLayer.onInterceptTouchEvent()." into...
authorTony Wickham <twickham@google.com>
Thu, 4 Aug 2016 21:43:17 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 21:43:17 +0000 (21:43 +0000)
am: 960a7fe15e

Change-Id: I2b490ce6c47bc48c6ca116fcb221d5c55cd53225


Trivial merge