OSDN Git Service

am 911de7fa: Settings: Wire up new doze opt-out setting.
authorJohn Spurlock <jspurlock@google.com>
Mon, 4 Aug 2014 19:06:10 +0000 (19:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Aug 2014 19:06:10 +0000 (19:06 +0000)
* commit '911de7fa8520f919cda673ae70c25f86ae0edf98':
  Settings: Wire up new doze opt-out setting.


Trivial merge