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
tree: 214b314940bc2a12ce8d199f8e22dbc5d55ab1eb
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags