am 0870de6b: am b7fbb821: Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev

* commit '0870de6bac41b1bd3189f4a5734208b57545c3a1':
  Genericize naming of sw720dp wallpapers