tree 1079618ea58a1f6f7d6c527a2355b3edfa2b201c
parent 939ba3591357e924530c7571a84702cf6624397e
parent d4d7f73deccaba515553eb4033f526e652583ad9
author Android Build Merger (Role) <android-build-merger@google.com> 1494278564 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494278568 +0000

Merge "Merge "DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am: 5b8250964b am: cc1435b7f3  -s ours" into oc-dev am: 817aa8fd23" into oc-dev-plus-aosp