tree 3ffa307c510425865c4f59297e43cf0435673e9c
parent 260b999e473f5a4ef616ed0da5edf332a2fce2dd
parent 98df4dc894b8d8b8a6cac932ce193fddb7858e99
author George Mount <mount@google.com> 1369785024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369785024 +0000

Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbad