OSDN Git Service

Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1...
authorAdrian Roos <roosa@google.com>
Tue, 25 Oct 2016 22:11:37 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Oct 2016 22:11:37 +0000 (22:11 +0000)
commit0d280c5a52e3794e0c73e5284f1d6bb21adb6d07
tree7f1a4a31fb9f020432d17f83e95200c2c735b107
parentcd9c84aff592d3e19196c819814f15216801b4ca
parent299b57410d836009625472c5e1fd866c4dead7d5
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2  -s ours
am: 299b57410d  -s ours

Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185