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