tree 660743b4f0d6d4108e795ff720a4e8f75e1a7135
parent 6e448e70fed66fdf7a38b1893db8080378927249
parent 3a19c4788d8c05d176f70e7965f2bffd4de1b0d5
author Michael Jurka <mikejurka@google.com> 1392411686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411686 +0000

am 3a19c478: am 2026a5a9: am 314b922b: am bf292a0b: Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf

* commit '3a19c4788d8c05d176f70e7965f2bffd4de1b0d5':
  Fix wallpaper cropping bugs