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

* commit '4e5bc5fbe2ce715b22cd039944c1cddc46b3940c':
tree: e812ed0c3a53e8c1d05dfd2ea97d5bcb8d348bde
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags