tree 214b314940bc2a12ce8d199f8e22dbc5d55ab1eb
parent c501f75bb7cab266334ce5f7fca6b5e24b068bbe
parent 392b69c3c3a695b77af528dd17c6a7cc6e4866f8
author Yorke Lee <yorkelee@google.com> 1380575855 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380575855 -0700

am 392b69c3: Merge "Disable drag and drop if the undo dialog for a favorite is showing" into klp-dev

* commit '392b69c3c3a695b77af528dd17c6a7cc6e4866f8':
  Disable drag and drop if the undo dialog for a favorite is showing