| commit | 89b7f7ff8e198916d79b0f59184bc5dd444a4dd4 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue May 29 13:42:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 29 13:42:17 2012 -0700 |
| tree | 642541cf06e75efa58005fca63a0adf93261b041 | |
| parent | aeb1ce5fe2e23d89d2f3f00a7623741945d75b12 [diff] | |
| parent | 0bbf868d53f55646651db6717468faeac618859d [diff] |
am 0bbf868d: Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev * commit '0bbf868d53f55646651db6717468faeac618859d': DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock