tree 5d4509aa0e46b31c0d13a20445aba534c868561f
parent eb81222633dcf14e10ed21af682b6c150d994fcc
parent 06440fb8ecd085a4e383552232001f2bc1291f91
author Michael Jurka <mikejurka@google.com> 1392411741 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411741 +0000

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

* commit '06440fb8ecd085a4e383552232001f2bc1291f91':
  Update suggested wallpaper dimensions in onResume