| commit | e50ba28aa1846a7c2a296f122a5675476dacc4a5 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Oct 19 17:19:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 19 17:19:35 2012 -0700 |
| tree | 29088bbcbc34bfe36b89ae6391dc43dc5bd5d19a | |
| parent | febe48aef0cb757e149d6f4494c9d220d6ba369a [diff] | |
| parent | 9e760d66c5dfae4d9688e32d7a02fca09569f7ef [diff] |
am 9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev * commit '9e760d66c5dfae4d9688e32d7a02fca09569f7ef': Camera2: Fix potential deadlock