tree 5d4509aa0e46b31c0d13a20445aba534c868561f
parent 86ee1473fbb53e4fa75b284711ae08cc798c73c9
parent 29de7557c5f47e9b3e1fb6a5b9afcd95d5b5b4c0
author Michael Jurka <mikejurka@google.com> 1392411264 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411264 +0000

am 29de7557: am 566bdc37: Merge "Update suggested wallpaper dimensions in onResume" into jb-ub-now-kermit

* commit '29de7557c5f47e9b3e1fb6a5b9afcd95d5b5b4c0':
  Update suggested wallpaper dimensions in onResume