tree 979a8fafd7e6cd474a458ef14ee93a703f231956
parent 48e725bdf4c92d3faf82c1788b56aa0491b566be
parent 7c9f33481fd3c063495813b2772e198ed696e3ce
author Mark Ashdown <ashdown@google.com> 1395277976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277976 +0000

am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '7c9f33481fd3c063495813b2772e198ed696e3ce':
  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