Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
Merge remote-tracking branch 'upstream/master' into bd859
added camera to manifest
camera connects but does not take pictures
camera opens the first time but is being passed a null preview so it crashes the next time it tries to open
fixed merge conflicts
working on camera preview work around
merge conflict laptop
Merge remote-tracking branch 'upstream/master' into bd859
merge conflics laptop
Merge remote-tracking branch 'origin/bd859' into bd859
testing to see if camera.release() sets camera to null
Merge remote-tracking branch 'upstream/master' into bd859
fix merge issue
Merge remote-tracking branch 'origin/bd859' into bd859
Camera debugging
setting up camera before loop
preview turns screen black
working on camera preview