tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 3fe985eaa4ccdf79d608adc3fcd02b52bcba1477
parent 7d4f508111fdd164a4c5f09aa93c902a5a776e2e
author Michael Jurka <mikejurka@google.com> 1392410182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410182 +0000

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

* commit '7d4f508111fdd164a4c5f09aa93c902a5a776e2e':