tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 78ea90e72b22bd22f13843a7003f4f383e8d320b
parent 8d65ac9eeceb9a6005d417bd5085abd3bcfdfb55
author Michael Jurka <mikejurka@google.com> 1392411088 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411088 +0000

am 8d65ac9e: am 7d4f5081: am 8e25924b: am ba65185e: Merge "Add content description for wallpaper thumbs" into jb-ub-now-indigo-rose

* commit '8d65ac9eeceb9a6005d417bd5085abd3bcfdfb55':