tree 37415f5e0590eef52a3412fa1e8dd403c03399d8
parent 8d7481f01e59c9538417ef603751b132d853035a
parent cdc566dfd638927ac04fb456f915d4a7600649a8
author Lucas Dupin <dupin@google.com> 1563576998 -0700
committer android-build-merger <android-build-merger@google.com> 1563576998 -0700

Merge "Use binned brightness sensor instead of prox" into qt-dev
am: cdc566dfd6

Change-Id: Ic4f1592ae6e9d62abd47734465d4f4638a70576e