am f697ac68: Merge "Fix 4020235: NPE at com.android.launcher2.DragLayer.onInterceptTouchEvent" into honeycomb-mr1

* commit 'f697ac683b955503b51d8412198e07b7aa0055e4':
  Fix 4020235: NPE at com.android.launcher2.DragLayer.onInterceptTouchEvent