tree cba62d0d64153aa2169651696bc238591341d679
parent 6270be2dda05f6f9a7b496233345c857877e3351
parent b8ca7ab8c3f089f60b785163e3add6fa2c33d5b8
author Michael Jurka <mikejurka@google.com> 1414085298 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085298 +0000

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

* commit 'b8ca7ab8c3f089f60b785163e3add6fa2c33d5b8':