Mark Salyzyn 8774152335 resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp ... am: 1ae7379baa Change-Id: Id715cb96a71fc9e48e14ff2e6f9e4883402aa6f6		2017-04-12 16:28:32 +00:00
..
3_0	resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp	2017-04-12 09:11:38 -07:00
3_4	Switch from ScopedFd to unique_fd.	2017-03-24 18:47:08 -07:00
Android.mk	Move Camera HAL 3.0 reference implementation.	2016-08-31 13:42:54 -07:00