Merge "Separate ambient display triggers" into nyc-mr1-dev

am: ee5eef1492

Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
This commit is contained in:
Adrian Roos
2016-10-18 22:16:39 +00:00
committed by android-build-merger

Diff Content Not Available