[automerger skipped] DO NOT MERGE Validate wallpaper dimension while...

[automerger skipped] DO NOT MERGE Validate wallpaper dimension while generating crop am: 160c28c3 am: f4c3460e am: 145dcf2c -s ours am: 554254d2 -s ours am: d89c22ad am: 0eee9ee8 am: 2ce38213
am: 8a1b4ce8 -s ours
am skip reason: subject contains skip directive

Change-Id: Iabdbc0d689f765ea2b3243135809a14f38cf3421