tree b5fc74dec91dfc9acb4a1dbb5f18e8ed90f5dd3a
parent bb1f895b1a537a593f03518ce1abcf85eca7b57d
parent 36de427e99b2cd9f2c40048eb9aebbbb4314f8f0
author Ivan Lozano <ivanlozano@google.com> 1547601795 -0800
committer android-build-merger <android-build-merger@google.com> 1547601795 -0800

Merge "Revert "Disable XOM in camera.v4l2."" am: 06ea58579b
am: 36de427e99

Change-Id: Ic5ac731ef527887cd6c8844d77d7ba1fab192f32