OSDN Git Service

Merge "Separate ambient display triggers" into nyc-mr1-dev am: 52af7e0759
authorAdrian Roos <roosa@google.com>
Tue, 18 Oct 2016 22:41:45 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 22:41:45 +0000 (22:41 +0000)
commit4fbbfc3088426d9e409027058c45eadb9bfd6b1c
treeab1bce8313084463632efaa4331c4bf642109d9f
parent102aa8b6f1a355a33a39d457f375fb15235f4151
parentf07199a9b1f12bef11e42b2000be7b4d57746eb8
Merge "Separate ambient display triggers" into nyc-mr1-dev am: 52af7e0759
am: f07199a9b1

Change-Id: I2bb40f0548ac493ad2810dc54041951fc44ae474