OSDN Git Service

Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492 am: f33b98b750
authorAdrian Roos <roosa@google.com>
Tue, 18 Oct 2016 22:50:13 +0000 (22:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 22:50:13 +0000 (22:50 +0000)
commit836a78189309f3c618b45cb21c2be6ef776b3e73
tree1cb3fc58d2d0633f3e9f8001cd11d88ea51bfd6e
parent2bd8835fda91bf0ac15eeee960cc91cc56ea5b6f
parent3ba7aab582e40bfeb37aa83e74c082c687e67d84
Merge "Separate ambient display triggers" into nyc-mr1-dev am: ee5eef1492 am: f33b98b750
am: 3ba7aab582

Change-Id: If3a88583281aca94caaa7614460b9249a2689fc5