| commit | b65ce67e4083b2026c9f31cb762abe4be39f1560 | [log] [tgz] |
|---|---|---|
| author | Ruben Brunk <rubenbrunk@google.com> | Thu Aug 13 23:05:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 23:05:08 2015 +0000 |
| tree | 44d991e522eeb1bd3d1a0bf2d265be807dd8fbb6 | |
| parent | b9d82b0c5048e73dfe354b337a849e814908d9f7 [diff] | |
| parent | 3ba0c6ec009aa675d3433cd6c12af173874787bd [diff] |
am 3ba0c6ec: Merge "Fix deadlock conditions in Camera3Device." into mnc-dev * commit '3ba0c6ec009aa675d3433cd6c12af173874787bd': Fix deadlock conditions in Camera3Device.