tree 10da860fcff71886af91d082e31f0e1917926848
parent 919c806fe4eedcf654553f3ea4ec343593ac8191
parent 2a4e4fcad342e23492d0d22a0bc287ab07ad7661
author Michael Jurka <mikejurka@google.com> 1414566320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566320 +0000

am 2a4e4fca: am 70f452ef: am 36f585b0: am f7b248b2: am 87752940: Merge "Fix issues with sizing wallpapers" into jb-ub-now-jetsonic

* commit '2a4e4fcad342e23492d0d22a0bc287ab07ad7661':