tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent 3110a270e2965be286b368ed8d0dc7377f8182df
parent 377a60a25e1d8720fbe6c463410ccf69feb8e573
author Adam Cohen <adamcohen@google.com> 1392411125 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411125 +0000

am 377a60a2: am 80663ba2: am b6d09a72: am ceb0b557: Merge "Add EXIF rotation support to wallpaper picker" into jb-ub-now-indigo-rose

* commit '377a60a25e1d8720fbe6c463410ccf69feb8e573':