OSDN Git Service

Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
authorGeoffrey Pitsch <gpitsch@google.com>
Tue, 1 Aug 2017 14:08:10 +0000 (14:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 14:08:10 +0000 (14:08 +0000)
commitcf83f9dd125125e199a3aee8110c718e46ff8854
treeb47eaa77dfb27e5840e9c537dfe5ddb0564bef35
parent72054d6db3296eb974538d5fa46d331fa0f5b10c
parent6d62355313d7ce92f1ee79b91c6c6643e466e14b
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am: 6d62355313

Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java