summaryrefslogtreecommitdiff
path: root/modules/camera/3_0/Stream.cpp
Commit message (Collapse)AuthorAgeFilesLines
* resolve merge conflicts of 7c451a93 to oc-dev-plus-aospMark Salyzyn2017-04-121-7/+8
| | | | | | Test: I solemnly swear I tested this conflict resolution. Bug: 34250038 Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f
* Move Camera HAL 3.0 reference implementation.Ari Hausman-Cohen2016-08-261-0/+241
Moved files to a subdir to allow reference implementations of other versions to join this same space without conflict. BUG: b/31117512 TEST: lunch bullhead-eng, make -j32, m -j32 camera.default Change-Id: I9bc3047bd3c00c53ce4d4e4f2070d8ee1453c936