tree 0917d48f59865355b53bd5e75799c7f98a17ef43
parent 3ea0e06a90b2ed36f7621532773adaf9bad6a406
parent 77ef6b2b5d30713eecd1509f43527f728bad08dc
author Adam Skory <skory@google.com> 1395278316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395278316 +0000

am 77ef6b2b: am 381fa3fb: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into release

* commit '77ef6b2b5d30713eecd1509f43527f728bad08dc':
  Import translations. DO NOT MERGE
  Fix black flash during rotation of -1 screen with GEL.
  Fix bug: Scroll position reported incorrectly to live wallpapers
  Add callback for "Widgets" button click in launcher
  handle shortcut restore for missing packages
  Import translations. DO NOT MERGE
  Catch exceptions if Exif is malformed
  Disable Set Wallpaper button while loading image
  Disabled the wallpaper when completely in -1 Now space.
  Import translations. DO NOT MERGE
  Fix back button behavior for "App info" when launched by Launcher3.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE