| 1ae7379baab4b2941ad1701190718cf53a051b48 |
|
12-Apr-2017 |
Mark Salyzyn <salyzyn@google.com> |
resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 34250038
Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f
|
| 09c2455a6734e9f6ffc5ade6d1b760f57193c66e |
|
01-Sep-2016 |
Greg Kaiser <gkaiser@google.com> |
Merge "modules/camera: Fix compiler warnings" am: f7888e1130 am: f832261e65 am: d6cebded75
am: c25d13db4a
Change-Id: Ie66d7974be62bb0db5bfcf73a3ddbb28cd9f8390
|
| 4f7139e6d909573554e63e8423c20bead306456e |
|
26-Aug-2016 |
Ari Hausman-Cohen <arihc@google.com> |
Move Camera HAL 3.0 reference implementation.
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
/hardware/libhardware/modules/camera/3_0/VendorTags.cpp
|