tree cba62d0d64153aa2169651696bc238591341d679
parent 243c3b0f921e608efbf507ccbea97d07a091f8af
parent 3a19c4788d8c05d176f70e7965f2bffd4de1b0d5
author Michael Jurka <mikejurka@google.com> 1414085471 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085471 +0000

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

* commit '3a19c4788d8c05d176f70e7965f2bffd4de1b0d5':