Merge "Modifying portals in landscape on the phone UI" into ics-mr1
am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1

* commit '587ae34aabc03e607c2ec2b37b8709bdf9cc33f0':
  Modifying portals in landscape on the phone UI
Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1
am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1

* commit '345ed924bac099236226c95eee925a91f6b75095':
  Fixing small regressions in folder text offset. (Bug 5600902)
am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1

* commit '587ae34aabc03e607c2ec2b37b8709bdf9cc33f0':
  Modifying portals in landscape on the phone UI
am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1

* commit '345ed924bac099236226c95eee925a91f6b75095':
  Fixing small regressions in folder text offset. (Bug 5600902)
Merge "Fix bug where all apps didn't load sometimes" into ics-mr1
am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1

* commit 'c97ddb679c7b2eaec78f136d840ad7975d03002f':
  Fix bug where all apps didn't load sometimes
am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1

* commit 'c97ddb679c7b2eaec78f136d840ad7975d03002f':
  Fix bug where all apps didn't load sometimes
Fix hiccup when dropping in springloaded mode on large ui

Change-Id: I434c594e0d2c94b122cd3336f36c529e6c3d1066
Fix bug where all apps didn't load sometimes

Bug #5623281
Updating default workspace and fixing issue where new hotseat browser icon is not shown. (Bug 5478946, Bug 5623287)

Change-Id: I7ebac3a4bde868de2b5beacc95fc94302dc0d6ee
am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '6fe22531fb81846a1ab69fa1b614e56562841943':
  Import revised translations.  DO NOT MERGE
am 13c690d4: am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1

* commit '13c690d42ce0266cc3c008342e27c480fa390e4b':
  Modifying portals in landscape on the phone UI
am 94355e03: am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1

* commit '94355e03e8388b3c7a263c0c9da12bac8c9914f1':
  Fixing small regressions in folder text offset. (Bug 5600902)
am 6b077585: am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1

* commit '6b0775851eb33a2cf255d387d9281cc01722a3ae':
  Fix bug where all apps didn't load sometimes
am 949ed903: am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '949ed90320462fa502c534293f602ea9ed257fee':
  Import revised translations.  DO NOT MERGE
am 22d4c4a2: am 13c690d4: am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1

* commit '22d4c4a29c453ead99f5d2e7cbb01625ff32412a':
  Modifying portals in landscape on the phone UI
am dadbe6b7: am 94355e03: am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1

* commit 'dadbe6b7cac4122d0e2882660a10d5bdb4c64e67':
  Fixing small regressions in folder text offset. (Bug 5600902)
am fa6f1f51: am 6b077585: am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1

* commit 'fa6f1f512c3a862bdad2a07f3bb36b03269705f0':
  Fix bug where all apps didn't load sometimes