diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2015-08-13 22:59:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 22:59:35 +0000 |
commit | 3ba0c6ec009aa675d3433cd6c12af173874787bd (patch) | |
tree | b2f5d5d8e4e9dee580233670912530da2b028ac0 /include/camera/ICameraService.h | |
parent | a45ccfb88f043f859f9674b8d78b0c3e93328d10 (diff) | |
parent | 183f056393423b344e73f388f21d30379a38e519 (diff) | |
download | frameworks_av-3ba0c6ec009aa675d3433cd6c12af173874787bd.zip frameworks_av-3ba0c6ec009aa675d3433cd6c12af173874787bd.tar.gz frameworks_av-3ba0c6ec009aa675d3433cd6c12af173874787bd.tar.bz2 |
Merge "Fix deadlock conditions in Camera3Device." into mnc-dev
Diffstat (limited to 'include/camera/ICameraService.h')
0 files changed, 0 insertions, 0 deletions