| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp | Mark Salyzyn | 2017-04-12 | 1 | -5/+6 |
| | | | | | | | Test: I solemnly swear I tested this conflict resolution. Bug: 34250038 Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f | ||||
| * | Merge "modules/camera: Fix compiler warnings" am: f7888e1130 am: f832261e65 ↵ | Greg Kaiser | 2016-09-01 | 1 | -1/+2 |
| | | | | | | | | | am: d6cebded75 am: c25d13db4a Change-Id: Ie66d7974be62bb0db5bfcf73a3ddbb28cd9f8390 | ||||
| * | Move Camera HAL 3.0 reference implementation. | Ari Hausman-Cohen | 2016-08-26 | 1 | -0/+273 |
| 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 | |||||
 |
index : hardware_libhardware.git | |
| hardware_libhardware |
| summaryrefslogtreecommitdiff |