tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 8e9f176431d87652cb28e37b36796e0a32038361
parent d6d565fc1df629ff392571b5cedd697eca6763b2
author Sunny Goyal <sunnygoyal@google.com> 1422685301 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685301 +0000

am d6d565fc: 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 'd6d565fc1df629ff392571b5cedd697eca6763b2':