tree cba62d0d64153aa2169651696bc238591341d679
parent 423fe0c6b5b649505bfe240224024c385b6bc2a0
parent ccd7808f98dc0244ab9e76aeef75a0cb887bbf5a
author Michael Jurka <mikejurka@google.com> 1414085151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085151 +0000

am ccd7808f: am 2265036a: am 43baad1e: am d5a6cb1b: am f373de17: Merge "Recover when reading corrupted widget previews" into jb-ub-now-indigo-rose

* commit 'ccd7808f98dc0244ab9e76aeef75a0cb887bbf5a':