tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 121d725e10313eb0d182ed5a8aa29a07cd6919b9
parent 2265036a94bfa64ba84de58c32a97214115a9e0e
author Michael Jurka <mikejurka@google.com> 1392410976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410976 +0000

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

* commit '2265036a94bfa64ba84de58c32a97214115a9e0e':