tree a97f2ba1c8138071f7aa95f834d2bfb48cd76c14
parent 2a4db1327ea4ccf9592eb4d842ec7db5d5ed59f2
parent a80ea2eec3df6477fcf04563c8bc47a57e90ce91
author Alan Viverette <alanv@google.com> 1440600512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440600512 +0000

am a80ea2ee: am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

* commit 'a80ea2eec3df6477fcf04563c8bc47a57e90ce91':
  Fix WallpaperCropper crash when setting wallpaper over 8MB