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:25:06 +0000 (22:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Oct 2016 22:25:06 +0000 (22:25 +0000)
commitc8083b56cfd5bf15354531677298268fe4210f7c
treedac474e750322892682eaa639f98d2d98072ab6b
parentcc425c10152547eb0c4710f84db1144a9dc3eedb
parent65bee562c0ca221603bc1174c803265f3251f442
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am: db1fd054d2  -s ours am: 299b57410d  -s ours am: 0d280c5a52  -s ours
am: 65bee562c0  -s ours

Change-Id: I58d0facdffd4b7da61d564bab4f5f2c2a214401d