tree cba62d0d64153aa2169651696bc238591341d679
parent 3ed310b21e20d4e6db7185cc88adc7f57dd53ddf
parent 70f452efbc90fcced38cb94fb9f0602ed59f6a84
author Michael Jurka <mikejurka@google.com> 1414085430 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085430 +0000

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

* commit '70f452efbc90fcced38cb94fb9f0602ed59f6a84':