tree 1af4848d203c8a50c1275ae96edae7f476ef96b3
parent ae76bdf499567a5ac802ec78ad13ffee01cff3bd
parent 70f452efbc90fcced38cb94fb9f0602ed59f6a84
author Michael Jurka <mikejurka@google.com> 1392411648 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411648 +0000

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

* commit '70f452efbc90fcced38cb94fb9f0602ed59f6a84':
  Fix issues with sizing wallpapers