| commit | ee42e7d5503c0d06bd0b2da96e5bb84ea086491a | [log] [tgz] |
|---|---|---|
| author | Ruben Brunk <rubenbrunk@google.com> | Fri Aug 14 03:18:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 03:18:26 2015 +0000 |
| tree | e517f609324fe76d0df22afc4121d09bfe0b58d3 | |
| parent | 1489f7d4d183c575a704adae43305b8f4c42a20f [diff] | |
| parent | b65ce67e4083b2026c9f31cb762abe4be39f1560 [diff] |
am b65ce67e: am 3ba0c6ec: Merge "Fix deadlock conditions in Camera3Device." into mnc-dev * commit 'b65ce67e4083b2026c9f31cb762abe4be39f1560': Fix deadlock conditions in Camera3Device.