OSDN Git Service

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

Change-Id: I9f3d116efa02bfca1df96414110722afe143a6dc


Trivial merge