tree 918cc27a451b23277c68793ef488b7941784126f
parent 608efd0dcfbb596b6fdc343fc560e204f37a3d70
parent 392b69c3c3a695b77af528dd17c6a7cc6e4866f8
author Yorke Lee <yorkelee@google.com> 1380586183 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380586183 -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