tree 79bf6c1f0488ea29bced0cdf318174dcf7a2f246
parent d6518c4b9569ddf9a8d66e4e60dc77c18e0ecb05
parent a4d0ef3c84cb5a9951d7d967c2c99d54d573f927
author Mark Ashdown <ashdown@google.com> 1395333116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395333116 +0000

am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'a4d0ef3c84cb5a9951d7d967c2c99d54d573f927':
  Fix issue of extra blank screen after uninstall (issue 12372657)
  Fix build
  Changed behaviour of the wallpaper picker.
  Guard against null default wallpaper
  Avoid stripping empty screens if the workspace is still loading (issue 12523285)
  Changed inconsistency when selecting default wallpaper, where it did not go back to home.
  skip backup if launcher is in a bad state
  Revert "Disabled the wallpaper when completely in -1 Now space."
  Updating Read/Write settings permission protectionLevels. (Bug 11372484)
  Fixed visibility issue of save button in case the url loading failed
  Import translations. DO NOT MERGE