| commit | dd72c3017aef65d099460cfc6c0402bc2ba85bc3 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue May 29 13:45:11 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 29 13:45:11 2012 -0700 |
| tree | e3f9aef36053aeef29e538a2b07575d9a65c4a51 | |
| parent | c9be8e558eba00cdb152102433b6873f3aff5c81 [diff] | |
| parent | 89b7f7ff8e198916d79b0f59184bc5dd444a4dd4 [diff] |
am 89b7f7ff: (-s ours) am 0bbf868d: Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev * commit '89b7f7ff8e198916d79b0f59184bc5dd444a4dd4': DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock