am c3665faf: (-s ours) DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.

* commit 'c3665faf4525de78c64e1a98106e12f1c23810c9':
  DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.
am a06da29b: Merge branch \'master\' of ssh://android-git:29418/platform/packages/apps/Launcher2

* commit 'a06da29bbed98447409213505bd570f976ff8f88':
am 55b34750: Reconcile with ics-factoryrom-release

* commit '55b347501bd46eb1dc66dafafce73e6b9c834a78':
  DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.
am c9c953da: am 446e940f: Locking orientation on phones (issue 4967793)

* commit 'c9c953da03347d96701a1e29f22e675ddee94d15':
  Locking orientation on phones (issue 4967793)
am c694fed7: (-s ours) am a2d4c807: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit 'c694fed73fe7642162d3b7d9b209f5d803e2db85':
  Import revised translations.  DO NOT MERGE
am 2a7f0b6e: am 9627936d: Merge "Updating the qsb. (5051804)" into ics-factoryrom

* commit '2a7f0b6e6cc1e4ea8d3a5f87f122e77e1a4f4ce5':
  Updating the qsb. (5051804)
am fb413c95: am 31e8624c: Merge "Fixing widget minResizeWidth/Height interpretation (Issue 5327589)" into ics-factoryrom

* commit 'fb413c9519cc7f97ac1901a0e55d85784b342bef':
  Fixing widget minResizeWidth/Height interpretation (Issue 5327589)
am 11420792: am 23409c2a: Merge "Fixing up search bar and adding bg. (5051804)" into ics-factoryrom

* commit '11420792b4d95e2c97350521128a349d3be0778d':
  Fixing up search bar and adding bg. (5051804)
am 034be6b2: am e5d77260: Tweaking search bar padding a little more. (5051804)

* commit '034be6b2620aee0ca98fa98007d5b5dc5a4e4b13':
  Tweaking search bar padding a little more. (5051804)
am e33f810a: Reconcile with ics-factoryrom-release

* commit 'e33f810a19d5db5b5c5a67eceeb12a5bc1a51b09':
am a279f5c2: am 18428a79: Merge "Updating Clings. (5057945, 5056643)" into ics-factoryrom

* commit 'a279f5c2b0c30cd7b0d3e574794fcfd1667531f0':
  Updating Clings. (5057945, 5056643)
am 8ded9eac: am ff648b55: Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding

* commit '8ded9eac3f02eb1e6044fc36c23a8f7c6356fd5d':
  Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
am 3dcb459b: Reconcile with ics-factoryrom-release

* commit '3dcb459b1ba9d02c4be81c0712b4310eb48bd884':
am dd12b66a: Merge "Import revised translations."

* commit 'dd12b66a9b40ea0f910f38b1a8b5469de98f5d8e':
  Import revised translations.
am 90b1f15f: am 7f0acdde: Deferring create hardware layers until we load widget pages. (5330412)

* commit '90b1f15fd59b07d9cb37f2ad006f569cc2ef9ba4':
  Deferring create hardware layers until we load widget pages. (5330412)
am 6d041a5d: am 0391096c: Merge "Launcher tweaks." into ics-factoryrom

* commit '6d041a5d90f6fb7c3d8bf35becfbd96ba685b728':
  Launcher tweaks.
am 087cf483: (-s ours) am 53c67ee6: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit '087cf483c009e92f548906cf7529345ceb86503a':
  Import revised translations.  DO NOT MERGE
am b062b0a8: Reconcile with ics-factoryrom-release

* commit 'b062b0a860b7b94d5e2764c7a43b663ded30db45':
am 9bd02bdb: am d71fc27f: Reordering default workspace folder.

* commit '9bd02bdbd0f90f33cf98e18bfb12618e101c001e':
  Reordering default workspace folder.
am 06ce0123: am 7a8c6545: Merge "Tweaking clings in response to usability testing. (5057945, 5056643)" into ics-factoryrom

* commit '06ce0123201182ace64f136778ce9e38d78ab444':
  Tweaking clings in response to usability testing. (5057945, 5056643)