tree 10da860fcff71886af91d082e31f0e1917926848
parent e9c4a33a7e24c3ea532d8953c1068bc84dbab37d
parent ac76ec8267039c03a3c4927648d0f3e1646ce8cd
author Michael Jurka <mikejurka@google.com> 1414566351 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566351 +0000

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

* commit 'ac76ec8267039c03a3c4927648d0f3e1646ce8cd':