tree e681fa0fb140970732365589a89e6bb228f3bd62
parent 9caf39821afcc9433e8c196a8ad42eb63cea4692
author Timothy Knight <tknight@google.com> 1416626926 -0800
committer Timothy Knight <tknight@google.com> 1416626926 -0800

CameraITS: Fix for bad merge, in a merge conflct resolution earslier today

Change-Id: I2f21eb0142345373c5a17e407659a068f3f2ac61