tree cba62d0d64153aa2169651696bc238591341d679
parent 3826d2b460d86ffcd99855b82a37b20f06071ec7
parent 06440fb8ecd085a4e383552232001f2bc1291f91
author Michael Jurka <mikejurka@google.com> 1414085527 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085527 +0000

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

* commit '06440fb8ecd085a4e383552232001f2bc1291f91':