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

am: 52af7e0759

Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3
This commit is contained in:
Adrian Roos
2016-10-18 22:12:53 +00:00
committed by android-build-merger

Diff Content Not Available