Commits
Michael Wright authored and Android Git Automerger committed b3ce4b1b789M
am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master * commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1': wallpaper: limit wallpaper width to sys.max_texture_size
Showing diff tocd98ecc66b9