tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent bb8def3cce2a599ab4de0a558900c48bbbaa274d
parent fc68261bf74b9059877c1193d8abb245430e3171
author Sunny Goyal <sunnygoyal@google.com> 1422669683 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669683 +0000

am fc68261b: am f95761eb: am f8177d38: Merge "Saving the system wallpaper thumbnail prefixed by the SDK_INT so that it is recreated after a system update." into ub-now-porkchop

* commit 'fc68261bf74b9059877c1193d8abb245430e3171':