[automerger skipped] DO NOT MERGE Validate wallpaper dimension while generating crop am: 160c28c36d am: f4c3460e24 am: 145dcf2c25 -s ours
am: 554254d2c0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3fe50e963294791acf04246045461b63957b0cc