tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 6b7a3523f4c458d81e251dbb76e6baf3734a328c
parent 43baad1e22b31b1efa0ec27e16fc84d2acf54467
author Michael Jurka <mikejurka@google.com> 1392410113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410113 +0000

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

* commit '43baad1e22b31b1efa0ec27e16fc84d2acf54467':