tree 21152e80436d0d76d622f245dcdc80b72ec4fcbe
parent 25a6639d872889475b005b029b59ad0b237218f4
parent 1a4916e1ae1865aa137caba8db9e2966f6e504cf
author Shuzhen Wang <shuzhenwang@google.com> 1562727300 -0700
committer android-build-merger <android-build-merger@google.com> 1562727300 -0700

Merge "Camera: Filter out NIR cameras for camera1 API" into qt-r1-dev am: 1393a2838d
am: 1a4916e1ae

Change-Id: I07c8aae1092a577882266e4147f6f0326693b95e