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