commit | 7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25 | [log] [tgz] |
---|---|---|
author | Sascha Haeberling <haeberling@google.com> | Fri Sep 13 21:26:37 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 13 21:26:37 2013 +0000 |
tree | a5f36a282f178fb26a941f588f74ea4ebbdeba42 | |
parent | a29e0bfcafa292adba7fff2daf0f754627e47137 [diff] | |
parent | 6100053eea36f0258091ee12be5f72c501209ad0 [diff] |
Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad