tree 27f37a7b999f1ad30cbd03a3fbcdde99d5a1a283
parent 4487e0aac4270f3ab429d27f454d4eb1efb19a6b
parent 381fa3fb2d990f7976a898c16f3675dbb325b848
author Adam Skory <skory@google.com> 1395277972 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277972 +0000

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

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