| commit | 51da31a916633a6bf9b7a4f52f7341da86ea2595 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Fri Sep 13 14:28:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 14:28:15 2013 -0700 |
| tree | 203ef813f4fca5ee9a24b9085c1718bff613d13f | |
| parent | b3804596c874387c83ab37d4ba489daed98af1c1 [diff] | |
| parent | 7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25 [diff] |
am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad * commit '7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25': Fix potential deadlock while rendering the preview.