tree b5fc74dec91dfc9acb4a1dbb5f18e8ed90f5dd3a
parent f944bc32e19b4c03d6bec2d7eafda86c98f6300c
parent 06ea58579b197c9ffad91762bbd785929093ccb1
author Ivan Lozano <ivanlozano@google.com> 1547600592 -0800
committer android-build-merger <android-build-merger@google.com> 1547600592 -0800

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

Change-Id: I2a69c6882341e7c9fa0fe664bffaef14346da6a6