tree 0353587131ab601071594a84859e6be32e953dd6
parent 1794ff64ef07399ae76a40f9bba46ecbf62b204b
parent f697ac683b955503b51d8412198e07b7aa0055e4
author Patrick Dubroy <dubroy@google.com> 1299540009 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299540009 -0800

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