tree dd07a5e848dae51b5ed2af952da998b78bb161d9
parent 28b32cbd9acec038f2e51a8b4cb97a5698ad380b
parent b040fcf52b4ccf6896e62a315abc447ea52db107
author Adam Cohen <adamcohen@google.com> 1392411215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411215 +0000

am b040fcf5: am a05060c9: am 18238d90: am 3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic

* commit 'b040fcf52b4ccf6896e62a315abc447ea52db107':
  Fix default wallpaper thumbnail