OSDN Git Service

Merge "Separate ambient display triggers" into nyc-mr1-dev
authorAdrian Roos <roosa@google.com>
Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Oct 2016 22:00:06 +0000 (22:00 +0000)

Trivial merge