am c9620c6b: am 3154c127: am a21e9537: Merge "Potential fix for out-of-date hardware layers" into ics-mr1

* commit 'c9620c6b0c75b4c508d3432a83386c711b79ec96':
  Potential fix for out-of-date hardware layers
am 84a1476e: am b7c9a026: am 049abba5: Merge "Fixing PagedView bad snap-back decisions" into ics-mr1

* commit '84a1476e00c3abb99f0b8efb671c8bdef985386a':
  Fixing PagedView bad snap-back decisions
am 21291a71: am dab85aa7: am 026df005: Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1

* commit '21291a712821dc8d173e56d4358e68e7ce4938ea':
  Fixing bug where drag would sometimes get cancelled inadvertently
am 9a03678e: am cfcc1f9d: am 07f920ed: Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1

* commit '9a03678e12909c663ee856976d50fd38c8ab6945':
  Fix issue 5639994: disabled multi-touch on folders
am bdd7f592: am e7299c80: (-s ours) am 31186d05: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'bdd7f5925c565b2e7943c66172120b5da5821409':
  Import revised translations. DO NOT MERGE
merge in ics-mr1-release history after reset to ics-mr1
Reconcile with ics-mr1-release

Change-Id: I6b3173e0900eedd8c37be072173650ff89f41e45
am 64d8a4ed: Reconcile with ics-mr1-release

* commit '64d8a4ed00646c3e327f0a636cc295b6a02d611f':
Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)

- Also allowing drop on all apps button to cancel a drag

Change-Id: I27252bd34c591882d8c5f80389d8fd6f4f6e4791
Prevent the creation of Shorcuts with null intents (issue 5629292)

Change-Id: I54fbad2d4af27c6d8fc0d79c33e890298a3db4dc
Unload widget previews when launcher is not visible

Can save ~1-2MB of RAM

Bug #5104303

Change-Id: I992bec33052f4d2c201e528b5edf384d05960e71
Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)

- Also fixing regression where widget drag previews weren't slightly translucent

Change-Id: I5370819589a2fc839df8742cda5156aec986b47d
am e326f186: Unload widget previews when launcher is not visible

* commit 'e326f186af6b00e4ea32849f1527254c669d0600':
  Unload widget previews when launcher is not visible
am e326f186: Unload widget previews when launcher is not visible

* commit 'e326f186af6b00e4ea32849f1527254c669d0600':
  Unload widget previews when launcher is not visible
am 81927a4d: am e326f186: Unload widget previews when launcher is not visible

* commit '81927a4d459e01d06c880002dcec978a6e446c59':
  Unload widget previews when launcher is not visible
am ee951cc5: am 81927a4d: am e326f186: Unload widget previews when launcher is not visible

* commit 'ee951cc5120c82ee2c50d63f10ba453bdbb2a41a':
  Unload widget previews when launcher is not visible
Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1
am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit 'ea49c1c8610ad7eb0367d073a410e989c8998160':
  Prevent the creation of Shorcuts with null intents (issue 5629292)
am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit 'ea49c1c8610ad7eb0367d073a410e989c8998160':
  Prevent the creation of Shorcuts with null intents (issue 5629292)
am 80d74893: am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit '80d748932ac2e6774f3e574bb4b9228b849cf6d5':
  Prevent the creation of Shorcuts with null intents (issue 5629292)