tree bdf1e045204003a5d380f458c823e5ebb9e019bc
parent 95334fcac6fb323a8c0115e5b51d50efb1f08509
parent 8c8abe936d21e95cf8f68689e750d56b6b98c04c
author Mark Ashdown <ashdown@google.com> 1392423839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392423839 +0000

am 8c8abe93: am 8ffe7b76: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release

* commit '8c8abe936d21e95cf8f68689e750d56b6b98c04c': (24 commits)
  Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
  Updating screen background assets. (Bug 12136457)
  Updating Tablet clings. (Bug 11973614)
  Migration update: ensuring all folders go first
  Lazy load the widget preview loader class
  Don't migrate shortcuts for components that no longer exist
  Import translations. DO NOT MERGE
  rationalize launcher backup logging
  Tightening migration conditions. (Bug 11973614)
  Replace "hotseat" with "Favorites tray" in user visible strings.
  Remove settings in overview mode for Launcher3.
  Fixing drop targets in phone / small tablet landscape (issue 12192781)
  Ensure that hasFirstRunActivity is only called when necessary
  Keep selected wallpaper on configuration change.
  search for a valid journal
  Fix NPE in Workspace.onDropCompleted
  Properly saving migration cling keys.
  restore app favorites and screens
  Fix longpress crash.
  Add ability to center the crop (disabled)
  ...