OSDN Git Service

Merge "Separate ambient display triggers" into nyc-mr1-dev
authorAdrian Roos <roosa@google.com>
Tue, 18 Oct 2016 22:12:53 +0000 (22:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 22:12:53 +0000 (22:12 +0000)
commitf07199a9b1f12bef11e42b2000be7b4d57746eb8
treeab7ef6f8aebf5f10430088306f7755f8daed72be
parent59116440e71028d03eb079cc77f860d2444e4403
parent52af7e07598b3085fb4c0789c0f4b477c01dcbf7
Merge "Separate ambient display triggers" into nyc-mr1-dev
am: 52af7e0759

Change-Id: I61ccb55ed8d4226fa46fdad8dd7845dfae3bc2a3