tree 033f372aa89e3b653fd58e7af6b0a040bdafa703
parent 45f44d6c3b2d6e3a60cd8f19a654a9470497c77f
parent 960a7fe15eb5145237f6d7aca64b469be835b70a
author Tony Wickham <twickham@google.com> 1470346997 +0000
committer android-build-merger <android-build-merger@google.com> 1470346997 +0000

Merge "Reset mActiveController to null in DragLayer.onInterceptTouchEvent()." into ub-launcher3-calgary
am: 960a7fe15e

Change-Id: I2b490ce6c47bc48c6ca116fcb221d5c55cd53225