am 08c8c0b4: Merge in Android 4.4

* commit '08c8c0b407644514983a0eeb8c97435bfeb7ef58':
Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
am cccfe95b: Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf

* commit 'cccfe95beb2de07fb3aef19e99e975e3a01cd055':
  Allowing ability to pick up items / enter overview before full page settle
am 04a231bb: Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf

* commit '04a231bbe44e9af184e76f124430a5bf7ae8ac8a':
  Making workspace->overview transition smoother
am 70123c34: am 78b3dbc8: Merge remote-tracking branch \'origin/kitkat-dev\'

* commit '70123c341b5357579084f1b1886a57605b9d2505':
  Initial empty repository
am 0c283cc5: am 08c8c0b4: Merge in Android 4.4

* commit '0c283cc5e77b63d9cbd9984857a5cc15250e688d':
Revert "Enable Launcher2 workspace import."

This reverts commit 5b3bdd394e4401d7e91d528ef1d424d1af271d97.

Bug: 11768766
Bug: 9832552
am a6a296ba: Revert "Enable Launcher2 workspace import."

* commit 'a6a296ba1ffba6c5b98e92f05254f0317f28290b':
  Revert "Enable Launcher2 workspace import."
Fix NPE in case where workspace is null because Launcher has been destroyed 

Bug: 11765964
Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf

* commit '060a48378f21a6b5836990a23178d02c94fccc60':
  Fix NPE in case where workspace is null because Launcher has been destroyed
Fix NPE in Launcher onDestroy

Bug: 11765296
Change-Id: I83299656cc90b8a744afb0db4b5ea08675c8db82
am d552dd90: Fix NPE in Launcher onDestroy

* commit 'd552dd90f1da32e1be2dd95ffed57c65d40cb651':
  Fix NPE in Launcher onDestroy
De-parent custom content view before adding to custom content screen

Bug: 11666352
Change-Id: Ief35e6e8a16ec0217e0dd27434723ee7a7d5beef
am 166ebd4d: De-parent custom content view before adding to custom content screen

* commit '166ebd4da5d85195bd1f562572f468726ade548f':
  De-parent custom content view before adding to custom content screen
Update custom content insets when Workspace insets are set

-> Not sure if custom content can be added before insets are set,
   so this is just a speculative fix.

Bug: 11875171
Change-Id: Ia8e07f51f527f464262b7ff99e4db245fe5a7906
Fix binding problem with no screens (issue 11768766)

Change-Id: I0a296892d4964913f38bf6d7bd2c2b17e1e0e8e0
Merge "Fix binding problem with no screens (issue 11768766)" into jb-ub-now-jolly-elf
Generalize support for 'App Info', 'Uninstall' and 'Delete'

This allows other DragSource's to allow this behaviour, instead of it being
tied to specific source types.

Change-Id: I06b7c39b1b34a0ae141245bcc13b6a0873a4c0fd
am 6400b84d: Update custom content insets when Workspace insets are set

* commit '6400b84d5594d7b9244e3b118f107033eb8b87a0':
  Update custom content insets when Workspace insets are set