tree 0ef768671f20e0816690d0f15e82b4c1bc1a98be
parent 3c4b7c568d5de16b738207e581e9cd48e4eb6529
parent d165d93679ba8d10d4c7572eb425845243a6e715
author Ruben Brunk <rubenbrunk@google.com> 1369085012 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369085012 -0700

am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce

* commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77':
  Avoid using region decoder for bad image types when setting wallpaper.