| commit | 9e760d66c5dfae4d9688e32d7a02fca09569f7ef | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Oct 19 16:47:32 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 19 16:47:32 2012 -0700 |
| tree | 441567e9a6922f6d2a3a8daad86559bf8abadb58 | |
| parent | 3c9e53c6ea2b01506addd4fb1164e6a9bbe6e16f [diff] | |
| parent | f1945f0435e431fab2e6b83337a1ffe71a8df28c [diff] |
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev